diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-15 12:59:52 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-15 12:59:52 +0200 |
| commit | 857a1d4aafc7fd4cc9d1f22c7ef4d274b09c2906 (patch) | |
| tree | 12b466fad1cb9ac56614ff9f3e1f0bae887c16a4 | |
| parent | a498783013497735fb9fa484be60f6148289b0bb (diff) | |
* apt-pkg/deb/dpkgpm.cc:
- pass --auto-deconfigure to dpkg (-B)
* debian/control:
- depend on a dpkg with support for breaks
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index bf0434ccc..93dff390d 100644 --- 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 202a15dc0..a0cd8080c 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.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 55c88c4c8..da396e755 100644 --- 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 dfcebf41e..62ca713f1 100644 --- 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. |