summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArno Töll <arno@debian.org>2013-07-13 22:21:50 +0200
committerArno Töll <arno@debian.org>2013-07-13 22:21:50 +0200
commit2f27ee55a9c4f41b32b8e2555ed32988119f8193 (patch)
tree5dad4cb5566ec84a9b5a9c5b13282bf687f77d43
parent04ef4eafec396ee45caa6c2780239769623f6a62 (diff)
downloadapache2-2f27ee55a9c4f41b32b8e2555ed32988119f8193.tar.gz
Document that the dh_apache2 conditional must be available in postrm, too. Thanks to cjwatson for spotting this
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/debhelper/dh_apache2.in4
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 89937142..9a9f1be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ apache2 (2.4.4-7) UNRELEASED; urgency=low
on dpkg's arguments supplied in $1, $2 etc. This clashes with function
arguments supplied to to sh sub-function. Allow manual override in such
cases.
+ * Mention that the dh_apache2 conditional must be present in postrm too (Closes: #716694)
- -- Arno Töll <arno@debian.org> Sat, 13 Jul 2013 13:35:17 +0200
+ -- Arno Töll <arno@debian.org> Sat, 13 Jul 2013 22:20:05 +0200
apache2 (2.4.4-6) unstable; urgency=low
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index a93a44e2..7b516445 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -230,8 +230,8 @@ to install Apache configuration files depending on a user input, for example if
they interface to the user through L<debconf(1)>.
The defaults is to always execute the scripts. The named function should be
-provided in the F<prerm> and F<postinst> scripts, before the B<#DEBHELPER#>
-token.
+provided in the F<prerm>, F<postrm> and F<postinst> scripts, before the
+B<#DEBHELPER#> token.
=item S<B<--restart>> S<B<-r>>