summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-25 23:53:43 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-06-25 23:53:43 +0000
commitc9fa6271e4813d88284771ff15050165eac38353 (patch)
treed0e78a8346fa694b4d9e8d1ed35e54bcd62ebc6c /debian
parentd9e050800067f16ba49cb6932d7a52a6de22ab9d (diff)
0.6.38ubuntu1
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198..df0433057 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,7 +17,7 @@ case "$1" in
configure)
if ! test -f /etc/apt/trusted.gpg; then
- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
fi
;;
diff --git a/debian/changelog b/debian/changelog
index be201057c..a249d92f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
+
apt (0.6.38) unstable; urgency=low
* Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround