diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/javascript-common.postinst | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 03b5257..1d2fa62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +javascript-common (11) unstable; urgency=low + + * Test if obsolete /etc/apache2/conf.d/ was removed by user before + touching it (Closes: #718249); Thanks Jean-Michel Vourgère. + * Improving clean up for fresh installs. + + -- Marcelo Jorge Vieira (metal) <metal@debian.org> Mon, 29 Jul 2013 11:36:13 -0300 + javascript-common (10) unstable; urgency=low * Downgrading webservers relation from 'recommends' to 'suggests' diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst index 66283a6..968d4f9 100644 --- a/debian/javascript-common.postinst +++ b/debian/javascript-common.postinst @@ -59,9 +59,13 @@ esac #DEBHELPER# # Will make piupart more happy on upgrades -if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "9" +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl "9" then - rmdir --ignore-fail-on-non-empty /etc/apache2/conf.d + # Remove old /etc/apache2/conf.d if empty and not already removed by user: + if [ -d /etc/apache2/conf.d ] + then + rmdir --ignore-fail-on-non-empty /etc/apache2/conf.d + fi # This is a work around bug #584185: if [ -d /etc/javascript-common ] then |