From: Daniel Hahler <g...@thequod.de> --- debian/changelog | 5 +++++ debian/postinst | 6 +++++- debian/postrm | 5 +++++ debian/preinst | 5 +++++ 4 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog index 0da1881..014b065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,11 @@ apt-build (0.12.38) unstable; urgency=low * Fix usage of dpkg obsolete option --print-installation-architecture in postinst (LP: #569158) + [ Daniel Hahler ] + * Remove obsolete conffile /etc/apt/sources.list.d/apt-build, which triggers + a warning now (Closes: #595582, LP: #693715) + - add dpkg-maintscript-helper stanza to preinst, postinst and postrm + -- Deepak Tripathi <apenguinli...@gmail.com> Wed, 02 Jun 2010 12:13:46 +0530 apt-build (0.12.37) unstable; urgency=low diff --git a/debian/postinst b/debian/postinst index e8d66c4..8667a6a 100755 --- a/debian/postinst +++ b/debian/postinst @@ -90,7 +90,7 @@ case "$1" in sed s/__arch__/`dpkg --print-architecture`/ /usr/share/apt-build/Release > "$repository_dir/Release" - # Add to sources.list if asked + # Add to sources.list.d if asked if [ "$add_to_sourceslist" = "true" ] && [ -z "`grep "$repository_dir" /etc/apt/sources.list`" ]; then tempfile=`tempfile -m 644` echo "deb file:$repository_dir apt-build main" > $tempfile @@ -140,5 +140,9 @@ case "$1" in ;; esac +# Remove old apt-build conffile, which appears to have never been used +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/apt/sources.list.d/apt-build 0.12.37 -- "$@" +fi #DEBHELPER# diff --git a/debian/postrm b/debian/postrm index 3a8ccb4..c792b0f 100755 --- a/debian/postrm +++ b/debian/postrm @@ -6,4 +6,9 @@ if [ "$1" = purge ]; then rm -f /etc/apt/apt-build.conf fi +# Remove old apt-build conffile, which appears to have never been used +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/apt/sources.list.d/apt-build 0.12.37 -- "$@" +fi + #DEBHELPER# diff --git a/debian/preinst b/debian/preinst index 6d1eb03..85d74d5 100755 --- a/debian/preinst +++ b/debian/preinst @@ -13,4 +13,9 @@ if [ "upgrade" = "$1" ]; then fi fi +# Remove old apt-build conffile, which appears to have never been used +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/apt/sources.list.d/apt-build 0.12.37 -- "$@" +fi + #DEBHELPER# -- 1.7.1 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org