* apt-pkg/deb/dpkgpm.cc:

  - pass --auto-deconfigure to dpkg (-B)
* debian/control:
  - depend on a dpkg with support for breaks

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index bf0434ccc5ab32c5333c122579f7d48117c743f8..93dff390d83c4fd37bf189c09e46c54757ede2a4 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -474,6 +474,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         case Item::Install:
         Args[n++] = "--unpack";
         Size += strlen(Args[n-1]);
+        Args[n++] = "--auto-deconfigure";
+        Size += strlen(Args[n-1]);
         break;
       }
       

diff --git a/configure.in b/configure.in
index 202a15dc0385d8e94e2042024973a8e73185faa5..a0cd8080c5ec5a5cf428b2ef6d1444907504759b 100644 (file)
--- 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.45ubuntu4")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu5")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 55c88c4c8ab9736ab76d60f4f9cbedd26ac209b7..da396e75574440195b95a7511113b595c82482ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ apt (0.6.45ubuntu5) edgy; urgency=low
   * apt-pkg/pkgcachegen.cc:
     - increase the APT::Cache-Limit to deal with the increased demand due
       to the translated descriptions
+  * apt-pkg/deb/dpkgpm.cc:
+    - pass "--auto-deconfigure" to dpkg on install to support the
+      new "breaks" in dpkg
+  * debian/control:
+    - depend on a dpkg with "breaks" support
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 

diff --git a/debian/control b/debian/control
index dfcebf41e13956b84dd57db513492c959c391e02..62ca713f1da32ce1485b8a3dcee8fe34f8f84e40 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Recommends: ubuntu-keyring
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev (>= 1.13.22ubuntu4), apt-doc, bzip2, gnupg
 Section: admin
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.