summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2010-01-29 21:32:54 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:37:06 +0100
commitc6d882fa727aaf2b16508c77f22d5b35da8ee33f (patch)
tree2fc12444129bf27f25263667bdc8cd5a999b16e6
parent44c00752aa9fc85f3ddc6415ad034fd2f6fa7026 (diff)
downloadapache2-c6d882fa727aaf2b16508c77f22d5b35da8ee33f.tar.gz
Add a hook to apache2.2-common's postrm script that may come in handy
when upgrading to 2.4 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1129 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/apache2.2-common.postrm25
-rw-r--r--debian/changelog2
2 files changed, 26 insertions, 1 deletions
diff --git a/debian/apache2.2-common.postrm b/debian/apache2.2-common.postrm
index 62d4e282..7f2d34dc 100644
--- a/debian/apache2.2-common.postrm
+++ b/debian/apache2.2-common.postrm
@@ -2,7 +2,30 @@
set -e
-if [ "$1" = purge ] ; then
+# Allow apache 2.4 to override what we do.
+if [ -x /etc/apache2/upgrade-to-2.4-in-progress ] ; then
+ set +e
+ /etc/apache2/upgrade-to-2.4-in-progress $0 "$@"
+ ret=$?
+ set -e
+ case $ret in
+ 42)
+ exit 0
+ ;;
+ 43)
+ DONT_PURGE=1
+ ;;
+ 0)
+ : # do nothing
+ ;;
+ *)
+ exit $ret
+ ;;
+ esac
+fi
+
+
+if [ "$1" = purge -a "$DONT_PURGE" != 1 ] ; then
rm -f /etc/apache2/httpd.conf \
/var/cache/apache2/reload \
/var/log/apache2/access.log* \
diff --git a/debian/changelog b/debian/changelog
index a9202561..91bf54c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ apache2 (2.2.14-6) UNRELEASED; urgency=low
* Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
* Fix symlinks in apache2-dbg package. Closes: #567076
* Add new init script action graceful-stop (LP: #456381)
+ * Add a hook to apache2.2-common's postrm script that may come in handy
+ when upgrading to 2.4.
* Make bug script also display php extensions.
-- Stefan Fritsch <sf@debian.org> Sat, 09 Jan 2010 13:11:11 +0100