summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-29 16:51:13 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-29 16:51:13 +0000
commit5573ba1ce06a0fbb684c06e37f110982042986b6 (patch)
tree2e86759f3b479fb7bf1abca390e74a22e2b78bbe
parent26184a8d0095cc73f730279d1796f308339d76da (diff)
Merge changelog entries from Colin's
-rw-r--r--debian/changelog13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a57872dd6..9784b0c92 100644
--- 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
+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