Merge changelog URI construction from apt-get

* src/generic/apt/pkg_changelog.cc:
  - use up-to-date changelog uri construction from apt-get
    using APT::Changelogs::Server
* src/apt_options.cc:
  - drop disused Aptitude::Changelog-URL-Template
* src/cmdline/cmdline_changelog.cc:
  - remove extraneous guess-work with source packages,
    which happened to also download the wrong changelog
    sometimes (Closes: #631464)
  - changelog download works with no deb-src lines, so
    we don't need to instruct the user to add any
    (Closes: #587775, #537393)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/generic/apt/pkg_changelog.h b/src/generic/apt/pkg_changelog.h
index c79407f5..a0748177 100644
--- a/src/generic/apt/pkg_changelog.h
+++ b/src/generic/apt/pkg_changelog.h
@@ -56,7 +56,7 @@ namespace aptitude
     {
       const std::string source_package;
       const std::string source_version;
-      const std::string section;
+      const std::string path;
       const std::string display_name;
 
     public:
@@ -66,11 +66,11 @@ namespace aptitude
        */
       changelog_info(const std::string &_source_package,
 		     const std::string &_source_version,
-		     const std::string &_section,
+                     const std::string &_path,
 		     const std::string &_display_name)
 	: source_package(_source_package),
 	  source_version(_source_version),
-	  section(_section),
+          path(_path),
 	  display_name(_display_name)
       {
       }
@@ -78,7 +78,7 @@ namespace aptitude
       static boost::shared_ptr<changelog_info>
       create(const std::string &source_package,
 	     const std::string &source_version,
-	     const std::string &section,
+             const std::string &path,
 	     const std::string &display_name);
 
       /** \brief Create a changelog_info structure that describes the
@@ -94,8 +94,8 @@ namespace aptitude
       const std::string &get_source_package() const { return source_package; }
       /** \brief Retrieve the name of the changelog's source version. */
       const std::string &get_source_version() const { return source_version; }
-      /** \brief Retrieve the section that the package is in. */
-      const std::string &get_section() const { return section; }
+      /** \brief Retrieve the path string for changelog url construction. */
+      const std::string &get_path() const { return path; }
       /** \brief Retrieve the display name of the changelog's package.
        *
        *  This is the name that should be displayed to the user when,