Merge changelog entries from Colin's

diff --git a/debian/changelog b/debian/changelog
index a57872dd6387a54346a2c0ad8e6be749e24745e8..9784b0c92bbe9d58be2417bf076c7e63ef876bb7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,19 @@ apt (0.6.39ubuntu4) breezy; urgency=low
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Wed, 29 Jun 2005 08:39:17 -0700
 
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Wed, 29 Jun 2005 08:39:17 -0700
 

+apt (0.6.39ubuntu3) breezy; urgency=low
+
+  * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+  * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+    /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Jun 2005 11:53:34 +0100
+

 apt (0.6.39ubuntu1) breezy; urgency=low
 
   * Michael Vogt
 apt (0.6.39ubuntu1) breezy; urgency=low
 
   * Michael Vogt