clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was

dropped in maverick.

diff --git a/debian/changelog b/debian/changelog
index d9207de566dbb58a3afce5ceace1b31a7fcab5b5..fbf44d6e40feb9f2fb38c6b19d3b69375c3631d2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.16~exp12ubuntu7) UNRELEASED; urgency=low
+
+  * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
+    dropped in maverick.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Mar 2012 00:05:43 -0700
+

 apt (0.8.16~exp12ubuntu6) precise; urgency=low
 
   * cherry pick from
 apt (0.8.16~exp12ubuntu6) precise; urgency=low
 
   * cherry pick from

diff --git a/debian/control b/debian/control
index 2354834ab4935d8c74e30999008159eb7bcfdc5a..caa9c6b46c90404a89dc027930f6015725207789 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Vcs-Browser: http://code.launchpad.net/apt/ubuntu
 
 Package: apt
 Architecture: any
 
 Package: apt
 Architecture: any

+Pre-Depends: dpkg (>= 1.15.7.2)

 Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
 Replaces: manpages-pl (<< 20060617-3~)
 Conflicts: python-apt (<< 0.7.93.2~)
 Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
 Replaces: manpages-pl (<< 20060617-3~)
 Conflicts: python-apt (<< 0.7.93.2~)

diff --git a/debian/postinst b/debian/postinst
index 1588f524123203701470750f6dac2e7678c67db4..eb2a67d0e2cc3190f121339fb9252eb719c52cfd 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,6 +10,9 @@
 
 set -e
 
 
 set -e
 

+dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \
+       0.8.16~exp12ubuntu6 -- "$@"
+

 create_apt_conf ()
 {
  EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list
 create_apt_conf ()
 {
  EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list

diff --git a/debian/postrm b/debian/postrm
index ae1e18d33df28abf150f8d05a3b447f23ea18653..bb19d32ccf8fbaf25886b9a26445560108875cb6 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -12,6 +12,9 @@ set -e
 
 #DEBHELPER#
 
 
 #DEBHELPER#
 

+dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \
+       0.8.16~exp12ubuntu6 -- "$@"
+

 case "$1" in
        remove)
                ;;
 case "$1" in
        remove)
                ;;

diff --git a/debian/preinst b/debian/preinst
index 985ad9b84dbeb65e2b95d36d5bb8bc281a1152a2..6ccdfb1a396c4a5beced218fdbff0a29f4c47283 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -7,6 +7,9 @@ set -e
 #  rm /var/state/apt
 #fi
 
 #  rm /var/state/apt
 #fi
 

+dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \
+       0.8.16~exp12ubuntu6 -- "$@"
+

 if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then
   if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then
     # upgrading from /var/state/apt using apt.
 if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then
   if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then
     # upgrading from /var/state/apt using apt.