* debian/apt.conf.ubuntu:

  - no longer install (empty) apt.conf.d/01ubuntu

diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu
deleted file mode 100644 (file)
index d295aee..0000000
--- a/debian/apt.conf.ubuntu
+++ /dev/null
@@ -1,3 +0,0 @@
-APT
-{
-};

diff --git a/debian/changelog b/debian/changelog
index 4da4e86b9e75256ed370b4f9e752281a595263ba..9ed7c587bff7e2f63478c12cae51dddb5f437042 100644 (file)
--- 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 6fc2ec9f0dd33356b78db97dbefc8d8ff06ee803..aa3a4145b8bb11907b7bf28161c661717ffa255f 100755 (executable)
--- 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