summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-06-09 10:49:00 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-06-09 10:49:00 +0200
commit9a1bc4e69b18636bce118ed4004bffd375364281 (patch)
tree466cace0c51f87a6d295a9eeb7fe71b8379dea63
parent164fed49362b28c0264c293a14a06d167e32b76f (diff)
* debian/apt.conf.ubuntu:
- no longer install (empty) apt.conf.d/01ubuntu
-rw-r--r--debian/apt.conf.ubuntu3
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules2
3 files changed, 7 insertions, 5 deletions
diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu
deleted file mode 100644
index d295aee25..000000000
--- a/debian/apt.conf.ubuntu
+++ /dev/null
@@ -1,3 +0,0 @@
-APT
-{
-};
diff --git a/debian/changelog b/debian/changelog
index 4da4e86b9..9ed7c587b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.25.3ubuntu10) maverick; urgency=low
+
+ * debian/apt.conf.ubuntu:
+ - no longer install (empty) apt.conf.d/01ubuntu
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 09 Jun 2010 10:48:16 +0200
+
apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
* debian/apt.postinst:
diff --git a/debian/rules b/debian/rules
index 6fc2ec9f0..aa3a4145b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -216,8 +216,6 @@ apt: build build-doc debian/shlibs.local
cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
- cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
-# head -n 500 ChangeLog > debian/ChangeLog
# copy lintian override
cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt