summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog20
3 files changed, 22 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 81f327c37..ad81a8228 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.46.3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46.3-0.1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
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 ac13357ff..d75be3565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-apt (0.6.46.4) unstable; urgency=low
+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
@@ -13,6 +14,23 @@ apt (0.6.46.4) unstable; urgency=low
--
+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
* apt-pkg/deb/dpkgpm.cc: