summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2012-03-24 00:09:07 -0700
committerSteve Langasek <steve.langasek@canonical.com>2012-03-24 00:09:07 -0700
commit6bd602616e8264216fa0f49f049db14f324a8c8d (patch)
tree94513d4231f32420ed64b1a4221a53240122a572 /debian
parent5079f660899a4e0fcf8c630c09db00288070722f (diff)
clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
dropped in maverick.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control1
-rwxr-xr-xdebian/postinst3
-rwxr-xr-xdebian/postrm3
-rwxr-xr-xdebian/preinst3
5 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d9207de56..fbf44d6e4 100644
--- 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
diff --git a/debian/control b/debian/control
index 2354834ab..caa9c6b46 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Vcs-Browser: http://code.launchpad.net/apt/ubuntu
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~)
diff --git a/debian/postinst b/debian/postinst
index 1588f5241..eb2a67d0e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,6 +10,9 @@
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
diff --git a/debian/postrm b/debian/postrm
index ae1e18d33..bb19d32cc 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -12,6 +12,9 @@ set -e
#DEBHELPER#
+dpkg-maintscript-helper rm_conffile /etc/apt/apt.conf.d/01ubuntu \
+ 0.8.16~exp12ubuntu6 -- "$@"
+
case "$1" in
remove)
;;
diff --git a/debian/preinst b/debian/preinst
index 985ad9b84..6ccdfb1a3 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -7,6 +7,9 @@ set -e
# 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.