Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,

removed in previous LTS.

diff --git a/debian/changelog b/debian/changelog
index fc638b2f1133b54973a2d492e45dd68927c8d1e4..e1b855a895295edfd75bfb31e19da18d8f1da38d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apt (0.9.6ubuntu1) UNRELEASED; urgency=low
 
 apt (0.9.6ubuntu1) UNRELEASED; urgency=low
 

+  [ Michael Vogt ]

   * merged from Debian, remaining changes:
     - use ubuntu keyring and ubuntu archive keyring in apt-key
     - run update-apt-xapian-index in apt.cron
   * merged from Debian, remaining changes:
     - use ubuntu keyring and ubuntu archive keyring in apt-key
     - run update-apt-xapian-index in apt.cron


@@ -11,6 +12,10 @@ apt (0.9.6ubuntu1) UNRELEASED; urgency=low
     - ubuntu changelog download handling
     - patch for apt cross-building, see http://bugs.debian.org/666772
 
     - ubuntu changelog download handling
     - patch for apt cross-building, see http://bugs.debian.org/666772
 

+  [ Steve Langasek ]
+  * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,
+    removed in previous LTS.
+

  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 May 2012 15:57:26 +0200
 
 apt (0.9.6) unstable; urgency=low
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 May 2012 15:57:26 +0200
 
 apt (0.9.6) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 785643bf388175eb19c8fdd650f6ee2dac13ab0e..4bdd3ce70d2a2f6810802219d784a50584442e41 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ 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 eb2a67d0e2cc3190f121339fb9252eb719c52cfd..1588f524123203701470750f6dac2e7678c67db4 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,9 +10,6 @@
 
 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 bb19d32ccf8fbaf25886b9a26445560108875cb6..ae1e18d33df28abf150f8d05a3b447f23ea18653 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -12,9 +12,6 @@ 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 6ccdfb1a396c4a5beced218fdbff0a29f4c47283..985ad9b84dbeb65e2b95d36d5bb8bc281a1152a2 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -7,9 +7,6 @@ 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.