Просмотр исходного кода

* apt-pkg/deb/dpkgpm.cc:
- pass --auto-deconfigure to dpkg (-B)
* debian/control:
- depend on a dpkg with support for breaks

Michael Vogt лет назад: 20
Родитель
Сommit
857a1d4aaf
4 измененных файлов с 9 добавлено и 2 удалено
  1. 2 0
      apt-pkg/deb/dpkgpm.cc
  2. 1 1
      configure.in
  3. 5 0
      debian/changelog
  4. 1 1
      debian/control

+ 2 - 0
apt-pkg/deb/dpkgpm.cc

@@ -474,6 +474,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 case Item::Install:
 	 case Item::Install:
 	 Args[n++] = "--unpack";
 	 Args[n++] = "--unpack";
 	 Size += strlen(Args[n-1]);
 	 Size += strlen(Args[n-1]);
+	 Args[n++] = "--auto-deconfigure";
+	 Size += strlen(Args[n-1]);
 	 break;
 	 break;
       }
       }
       
       

+ 1 - 1
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)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu4")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu5")
 PACKAGE="apt"
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 AC_SUBST(PACKAGE)

+ 5 - 0
debian/changelog

@@ -3,6 +3,11 @@ apt (0.6.45ubuntu5) edgy; urgency=low
   * apt-pkg/pkgcachegen.cc:
   * apt-pkg/pkgcachegen.cc:
     - increase the APT::Cache-Limit to deal with the increased demand due
     - increase the APT::Cache-Limit to deal with the increased demand due
       to the translated descriptions
       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
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 
 

+ 1 - 1
debian/control

@@ -14,7 +14,7 @@ Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Provides: ${libapt-pkg:provides}
 Recommends: ubuntu-keyring
 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
 Section: admin
 Description: Advanced front-end for dpkg
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  This is Debian's next generation front-end for the dpkg package manager.