summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules2
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst
index df0433057..ae1801198 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/ubuntu-archive.gpg /etc/apt/trusted.gpg
+ cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
fi
;;
diff --git a/debian/changelog b/debian/changelog
index fc1545230..89d418572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.6.43.2ubuntu2) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 19:16:23 +0200
+
apt (0.6.43.2ubuntu1) dapper; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
diff --git a/debian/rules b/debian/rules
index 6c0a24fd9..34c947c69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -209,7 +209,7 @@ apt: build debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
- cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
+ cp share/debian-archive.gpg debian/$@/usr/share/$@
# head -n 500 ChangeLog > debian/ChangeLog