remove auto-generated apt-key and sources.list on clean (closes: 739749)

diff --git a/cmdline/makefile b/cmdline/makefile
index 06f170b6a802eafde6ad694423db89a7233610f6..f89192e101dc77808b76a852790f2dcb4697d3cd 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -40,20 +40,6 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 
-# The apt-key program
-apt-key: apt-key.in
-       sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \
-               -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \
-               -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \
-               -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \
-               -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@
-       chmod 755 $@
-
-SOURCE=apt-key
-TO=$(BIN)
-TARGET=program
-include $(COPY_H)
-
 # The apt-mark program
 PROGRAM=apt-mark
 SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
@@ -99,3 +85,22 @@ SLIBS = -lapt-pkg $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-dump-solver.cc
 include $(PROGRAM_H)
+
+# The apt-key program
+apt-key: apt-key.in
+       sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \
+               -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \
+               -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \
+               -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \
+               -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@
+       chmod 755 $@
+
+SOURCE=apt-key
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)
+
+clean: clean/apt-key
+
+clean/apt-key:
+       rm -f apt-key

diff --git a/debian/changelog b/debian/changelog
index 0780118ad8bc80c386e4ccb0220d7246c9a02232..78c2d457356c985c24e34e86cb80c45c86f1fca9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.9.15.4) UNRELEASED; urgency=low
+
+  * remove auto-generated apt-key and sources.list on clean (closes: 739749)
+
+ -- Michael Vogt <mvo@debian.org>  Sat, 22 Feb 2014 17:58:08 +0100
+
 apt (0.9.15.3) unstable; urgency=medium
 
   [ Michael Vogt ]

diff --git a/vendor/debian/makefile b/vendor/debian/makefile
index 1f82d7f47c1b12ad482d946d3b8482d9f94e303c..a1bb74f9bb92c2c9d4cc86f0d729f1730999ad18 100644 (file)
--- a/vendor/debian/makefile
+++ b/vendor/debian/makefile
@@ -9,3 +9,7 @@ doc binary manpages: sources.list
 
 sources.list: sources.list.in ../../doc/apt-verbatim.ent
        sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
+
+clean:
+       rm -f sources.list
+

diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile
index ced566c30762c29c1b03fadc3fa1f465a41d98c3..e5513ead4821d36026f686f1fbddbffa0b9b7659 100644 (file)
--- a/vendor/raspbian/makefile
+++ b/vendor/raspbian/makefile
@@ -9,3 +9,6 @@ doc binary manpages: sources.list
 
 sources.list: sources.list.in ../../doc/apt-verbatim.ent
        sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
+
+clean:
+       rm -f sources.list

diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile
index c27494587baeb112d18dc7d67ac5fdffc448c31e..45ea18be2f0406fe39259f3323b14ad7685adb99 100644 (file)
--- a/vendor/steamos/makefile
+++ b/vendor/steamos/makefile
@@ -9,3 +9,7 @@ doc binary manpages: sources.list
 
 sources.list: sources.list.in ../../doc/apt-verbatim.ent
        sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@
+
+clean:
+       rm -f sources.list
+

diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile
index c4b35935f92195f226a41946aa7ee6923b80660c..1fe138d2bbf7c34132c8a013c717009c77b4104d 100644 (file)
--- a/vendor/ubuntu/makefile
+++ b/vendor/ubuntu/makefile
@@ -9,3 +9,6 @@ doc binary manpages: sources.list
 
 sources.list: sources.list.in ../../doc/apt-verbatim.ent
        sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@
+
+clean:
+       rm -f sources.list