summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArno Töll <arno@debian.org>2013-07-23 13:31:54 +0200
committerArno Töll <arno@debian.org>2013-07-23 13:31:54 +0200
commitce7ee3cef8ceb1a6fdceb55d8d655e413d94f9dd (patch)
tree80b63da3cc7970ab4544e2b516510ab0c3355468
parent2e75f7e53abab76640d9c3edb00fcd245646cc0d (diff)
downloadapache2-debian/2.4.6-2.tar.gz
Allos apache2-maintscript-helper consumers to use triggers in their maintainer scriptdebian/2.4.6-2
-rw-r--r--debian/changelog9
-rw-r--r--debian/debhelper/apache2-maintscript-helper2
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index bfa8116b..2e8c4830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-apache2 (2.4.6-2) UNRELEASED; urgency=low
+apache2 (2.4.6-2) unstable; urgency=low
+ [ Stefan Fritsch ]
* Fix watch file
* Don't pass --silent to libtool, allowing blhc to check the compiler
options in the build logs.
- -- Stefan Fritsch <sf@debian.org> Mon, 22 Jul 2013 21:06:25 +0200
+ [ Arno Töll ]
+ * Allow third party packages to use triggers if they use them in a
+ maintainer script invoking apache2-maintscript-helper (Closes: #717610)
+
+ -- Arno Töll <arno@debian.org> Tue, 23 Jul 2013 13:25:30 +0200
apache2 (2.4.6-1) unstable; urgency=low
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 4faf5c0b..50f34181 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -105,7 +105,7 @@ else
fi
case "$APACHE2_MAINTSCRIPT_METHOD" in
- install|upgrade|abort-upgrade|configure|abort-remove|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install)
+ install|upgrade|abort-upgrade|configure|abort-remove|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install|triggered)
# yay - recognized script
;;
*)