Use https for Ubuntu changelogs

We just enabled https on changelogs.ubuntu.com, let's use it.

5 files changed, 9 insertions, 9 deletions

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 5c34113e7..927a5cca0 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -207,7 +207,7 @@ bool pkgInitConfig(Configuration &Cnf)
 
    Cnf.CndSet("Acquire::Changelogs::URI::Origin::Debian", "http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog");
    Cnf.CndSet("Acquire::Changelogs::URI::Origin::Tanglu", "http://metadata.tanglu.org/changelogs/@CHANGEPATH@_changelog");
-   Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ubuntu", "http://changelogs.ubuntu.com/changelogs/pool/@CHANGEPATH@/changelog");
+   Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ubuntu", "https://changelogs.ubuntu.com/changelogs/pool/@CHANGEPATH@/changelog");
    Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ultimedia", "http://packages.ultimediaos.com/changelogs/pool/@CHANGEPATH@/changelog.txt");
    Cnf.CndSet("Acquire::Changelogs::AlwaysOnline::Origin::Ubuntu", true);
 
diff --git a/doc/po/es.po b/doc/po/es.po
index 663ffa86e..1ade7d522 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -1415,7 +1415,7 @@ msgstr ""
 #| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
 #| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
 #| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
-#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
 #| "changelogs</ulink> for Ubuntu).  By default it displays the changelog for "
 #| "the version that is installed.  However, you can specify the same options "
 #| "as for the <option>install</option> command."
@@ -1430,7 +1430,7 @@ msgstr ""
 "pager</command>. El nombre de servidor y el directorio base se define con la "
 "variable <literal>APT::Changelogs::Server</literal> (por ejemplo, <ulink url="
 "\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</"
-"ulink> para Debian o <ulink url=\"http://changelogs.ubuntu.com/changelogs"
+"ulink> para Debian o <ulink url=\"https://changelogs.ubuntu.com/changelogs"
 "\">changelogs.ubuntu.com/changelogs</ulink>  para Ubuntu). Por omisión, "
 "muestra el fichero de registro de cambios de la versión instalada. Por otra "
 "parte, puede definir las mismas opciones que con la orden <option>install</"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index fd89d98ea..46513d19d 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -1398,7 +1398,7 @@ msgstr ""
 #| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
 #| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
 #| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
-#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
 #| "changelogs</ulink> for Ubuntu).  By default it displays the changelog for "
 #| "the version that is installed.  However, you can specify the same options "
 #| "as for the <option>install</option> command."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 058350339..d8d4c4b7a 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1393,7 +1393,7 @@ msgstr ""
 #| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
 #| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
 #| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
-#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
 #| "changelogs</ulink> for Ubuntu).  By default it displays the changelog for "
 #| "the version that is installed.  However, you can specify the same options "
 #| "as for the <option>install</option> command."
diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog
index ee7b3ef97..2a632d6db 100755
--- a/test/integration/test-apt-get-changelog
+++ b/test/integration/test-apt-get-changelog
@@ -27,12 +27,12 @@ releasechanger() {
 	rm -f rootdir/var/cache/apt/*.bin
 }
 releasechanger 'Origin' 'Ubuntu'
-testsuccessequal "'http://changelogs.ubuntu.com/changelogs/pool/main/f/foo/foo_1.0/changelog' foo.changelog
-'http://changelogs.ubuntu.com/changelogs/pool/main/libb/libbar/libbar_1.0/changelog' libbar.changelog" aptget changelog foo libbar --print-uris
+testsuccessequal "'https://changelogs.ubuntu.com/changelogs/pool/main/f/foo/foo_1.0/changelog' foo.changelog
+'https://changelogs.ubuntu.com/changelogs/pool/main/libb/libbar/libbar_1.0/changelog' libbar.changelog" aptget changelog foo libbar --print-uris
 
 releasechanger 'Label' 'Debian'
-testsuccessequal "'http://changelogs.ubuntu.com/changelogs/pool/main/f/foo/foo_1.0/changelog' foo.changelog
-'http://changelogs.ubuntu.com/changelogs/pool/main/libb/libbar/libbar_1.0/changelog' libbar.changelog" aptget changelog foo libbar --print-uris
+testsuccessequal "'https://changelogs.ubuntu.com/changelogs/pool/main/f/foo/foo_1.0/changelog' foo.changelog
+'https://changelogs.ubuntu.com/changelogs/pool/main/libb/libbar/libbar_1.0/changelog' libbar.changelog" aptget changelog foo libbar --print-uris
 
 testsuccessequal "'http://localhost:${APTHTTPPORT}/main/f/foo/foo_1.0.changelog' foo.changelog
 'http://localhost:${APTHTTPPORT}/main/libb/libbar/libbar_1.0.changelog' libbar.changelog" aptget changelog foo libbar --print-uris -o Acquire::Changelogs::URI::Label::Debian="http://localhost:${APTHTTPPORT}/@CHANGEPATH@.changelog"