summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d71a78e71..2ff5dd8c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (0.6.39) unstable; urgency=low
+
+ * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
+ * Merge mvo's changes from 0.6.36ubuntu1:
+ michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
+ * Merge aggregated translation updates:
+ bubulle@debian.org--2005/apt--main--0
+ * Update priority of apt-utils to important, to match the override file
+
+ --
+
apt (0.6.38ubuntu1) breezy; urgency=low
* First release from Ubuntu branch
@@ -20,6 +31,22 @@ apt (0.6.38) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
+apt (0.6.38) unstable; urgency=low
+
+ * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
+ for the French man pages' failure to build
+ * Branch Debian and Ubuntu
+ - apt.postinst, apt-key: use the appropriate keyring
+ - debian/rules: install all keyrings
+ * Add the current Debian archive signing key (4F368D5D) to
+ debian-archive.gpg
+ * make pinning on the "component" work again (using the section of the
+ archive, we don't use per-section Release files anymore with apt-0.6)
+ (closes ubuntu #9935)
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
+
+>>>>>>> MERGE-SOURCE
apt (0.6.37) breezy; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-81