[Pkg-javascript-commits] [SCM] javascript-common branch, master, updated. 7-22-g2d7cc38

[Jean-Michel Vourgère]

The following commit has been merged in the master branch:
commit 771fcad679aefe6bf3cf5fd65087a280737baacd
Author: Jean-Michel Vourgère <jmv_deb at nirgal.com>
Date:   Fri Jul 19 14:34:02 2013 +0200

    Makes piupart happy
    
    prerm: Remove /etc/lighttpd/conf-enabled/ if empty. We might have created it
     on postinst.
    postinst: Remove /etc/apache2/conf.d/ if empty. We might have created it in an
     pre-9 version.
    
    This closes #603205

diff --git a/debian/changelog b/debian/changelog
index 9de5fb8..c8b8a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ javascript-common (9) UNRELEASED; urgency=low
   * Make lintian happy:
     . Bumped standard to 3.9.4 (no change required).
     . Canonicalize control vcs-fields.
+  * Make piuparts happy: (Closes: #603205)
+    . Remove conf-enabled/ on postrm if empty.
+    . Remove obsolete dir conf.d/ if empty on configure.
   * Moved /etc/javascript-common conffiles into their final conf-available
     locations.
     conf-enabled/ and conf.d files are now proper links on conf-available ones.
diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst
index 0c1dd94..1119533 100644
--- a/debian/javascript-common.postinst
+++ b/debian/javascript-common.postinst
@@ -35,10 +35,11 @@ esac
 
 #DEBHELPER#
 
-# This is a work around bug #584185:
 # Will make piupart more happy on upgrades
 if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl "9"
 then
+	rmdir --ignore-fail-on-non-empty /etc/apache2/conf.d
+	# This is a work around bug #584185:
 	rmdir --ignore-fail-on-non-empty /etc/javascript-common
 fi
 
diff --git a/debian/javascript-common.postrm b/debian/javascript-common.postrm
index 2e3e3ae..14cc486 100644
--- a/debian/javascript-common.postrm
+++ b/debian/javascript-common.postrm
@@ -22,6 +22,10 @@ case "${1}" in
 			rm -f /etc/lighttpd/conf-enabled/90-javascript-alias.conf
 			invoke-rc.d lighttpd reload || true
 		fi
+		if [ -d /etc/lighttpd/conf-enabled/ ]
+		then
+			rmdir --ignore-fail-on-non-empty /etc/lighttpd/conf-enabled/
+		fi
 		;;
 
 	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

-- 
javascript-common