Fix keyring path in apt-key

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2ff5dd8c3d1ca420dd593f44d8a60bb91a0f0858..a5f2b896010a05632ec1e878ab27d47f2b96f5d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+  * Fix keyring path in apt-key (I swear I remember doing this before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+  * Michael Vogt
+    - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+    - Fix a incorrect example in the man-page (closes: #282918)
+    - Support architecture-specific extra overrides
+      (closes: #225947). Thanks to  Anthony Towns for idea and
+      the patch, thanks to Colin Watson for testing it.
+    - better report network timeouts from the methods to the acuire code,
+      only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 28 Jun 2005 11:52:24 -0700
+
 apt (0.6.39) unstable; urgency=low
 
   * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -6,8 +25,9 @@ apt (0.6.39) unstable; urgency=low
   * Merge aggregated translation updates:
     bubulle@debian.org--2005/apt--main--0
   * Update priority of apt-utils to important, to match the override file
+  * Install only one keyring on each branch (Closes: #316119)
 
- -- 
+ -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 28 Jun 2005 11:35:21 -0700
 
 apt (0.6.38ubuntu1) breezy; urgency=low
 
@@ -30,6 +50,9 @@ apt (0.6.38) unstable; urgency=low
     (closes ubuntu #9935)
   
  -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
+=======
+ -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 28 Jun 2005 11:51:09 -0700
+>>>>>>> MERGE-SOURCE
 
 apt (0.6.38) unstable; urgency=low