summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2006-12-14 11:29:20 +0100
committerMichael Vogt <egon@bottom>2006-12-14 11:29:20 +0100
commit478707e015972cd3efea32059c97b13508705a26 (patch)
tree6c69c35fd70b57744d756539b91b7509b6d593ae /debian
parentb790b130ad0a43be5738c467c16bbc2dd657ca66 (diff)
parenta7a5b0e45e2e66ab2142da8181bcc9cd0b3ba8a8 (diff)
* merged with apt--debian-sid
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog34
2 files changed, 34 insertions, 2 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198..88fb932df 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -20,6 +20,8 @@ case "$1" in
cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
fi
+ apt-key update
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index a1e084fe2..3b392444b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
-apt (0.6.46.4) unstable; urgency=low
+apt (0.6.46.5) unstable; urgency=low
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+
+ --
+
+apt (0.6.46.4) unstable; urgency=high
+
+ * ack NMU (closes: #401017)
* added apt-secure.8 to "See also" section
* apt-pkg/deb/dpkgpm.cc:
- added "Dpkg::StopOnError" variable that controls if apt
@@ -10,8 +18,30 @@ apt (0.6.46.4) unstable; urgency=low
- uk.po: New Ukrainian translation: 483t28f3u
- el.po: Update to 503t9f2u
- de.po: Updates and corrections.
+ * apt-pkg/contrib/progress.cc:
+ - OpProgress::CheckChange optimized, thanks to Paul Brook
+ (closes: #398381)
+ * apt-pkg/contrib/sha256.cc:
+ - fix building with noopt
- --
+ -- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100
+
+apt (0.6.46.3-0.2) unstable; urgency=high
+
+ * Non-maintainer upload with permission of Michael Vogt.
+ * Fix FTBFS on most arches (regression from the fix of #400874)
+
+ -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 15:51:22 +0000
+
+apt (0.6.46.3-0.1) unstable; urgency=high
+
+ * Non-maintainer upload with permission of Michael Vogt.
+ * Fix segfault at apt-get source. Closes: #400874
+ * Add apt-key update in postinst, so that debian-archive-keyring doesn't
+ need to depend on apt >= 0.6. Closes: #401114
+ * Don't double-queue pdiff files. Closes: #401017
+
+ -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 10:34:56 +0000
apt (0.6.46.3) unstable; urgency=low