[apache2] 01/01: postrm removes content of /var/lib/apache2 #793862

[Jean-Michel Vourgère]

This is an automated email from the git hooks/post-receive script.

nirgal pushed a commit to branch master
in repository apache2.

commit ffa07b558a5ea9183c81962f0ab6b6516be5734d
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Tue Aug 11 11:16:49 2015 +0200

    postrm removes content of /var/lib/apache2 #793862
    
    and not the directory itself.
    
    Also moved the /var/lib/apache2/deferred_actions removal from apache2-bin to
    apache2.
    Cowardly leaving /var/lib/apache2 in apache2-bin.dirs.
---
 debian/apache2-bin.postrm | 34 ----------------------------------
 debian/apache2.postrm     |  5 ++++-
 debian/changelog          |  7 +++++++
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/debian/apache2-bin.postrm b/debian/apache2-bin.postrm
deleted file mode 100644
index 618cf99..0000000
--- a/debian/apache2-bin.postrm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# postrm script for apache2-bin
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    purge)
-
-	rm -f /var/lib/apache2/deferred_actions
-    ;;
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/apache2.postrm b/debian/apache2.postrm
index 14cb547..01c4e6f 100644
--- a/debian/apache2.postrm
+++ b/debian/apache2.postrm
@@ -25,10 +25,13 @@ case "$1" in
 	for d in var/cache/apache2 \
 		 var/cache/apache2/mod_cache_disk \
 		 var/log/apache2 \
-		 var/lib/apache2 ; do
+		 var/lib/apache2/conf \
+		 var/lib/apache2/module \
+		 var/lib/apache2/site ; do
 		[ -d $d ] && rm -rf $d
 	done
 
+	rm -f /var/lib/apache2/deferred_actions
 
 	for f in /etc/apache2/sites-enabled/* \
 		/etc/apache2/conf-enabled/* \
diff --git a/debian/changelog b/debian/changelog
index 5152a67..0d99ce1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.16-3) UNRELEASED; urgency=medium
+
+  * Have apache2.postrm removes content of /var/lib/apache2, not the
+    directory itself. Closes: #793862
+
+ -- Jean-Michel Vourgère <nirgal at debian.org>  Tue, 11 Aug 2015 11:12:04 +0200
+
 apache2 (2.4.16-2) unstable; urgency=medium
 
   * Make dh_apache2 add a versioned dependency on apache2-bin, for the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git