[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-121-gdf90ce1

[Arno Töll]

The following commit has been merged in the master branch:
commit 5d5a209d1509769acae05a5fbd426b4642c23705
Author: Arno Töll <arno at debian.org>
Date:   Fri Jun 7 16:49:24 2013 +0200

    Make apache2-maintscript-helper usable in uncommon environments

diff --git a/debian/changelog b/debian/changelog
index 1a8ccd5..16e50b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,12 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
   * Fix indentation mess in the init script, and add modelines
   * Make sure /etc/init.d/apache2 reload does not always return. Thanks to
     Thorsten Glaser for suggesting a patch (Closes: #711117)
+  * Make apache2-maintscript-helper usable when sourced from weird
+    environments (e.g. Perl maintainer scripts). Thanks to Robert Luberda
+    for doing unexpected things, and providing patches for it, and to Axel
+    Beckert for demangling shell specifics (Closes: #711479)
 
- -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 15:48:48 +0200
+ -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 16:47:22 +0200
 
 apache2 (2.4.4-5) unstable; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index b313496..37f0a05 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -75,7 +75,9 @@ else
 		return 1
 	fi
 
-	APACHE2_MAINTSCRIPT_NAME="${0##*.}"
+	APACHE2_MAINTSCRIPT_NAME="$DPKG_MAINTSCRIPT_NAME"
+	[ "$APACHE2_MAINTSCRIPT_NAME" ] || APACHE2_MAINTSCRIPT_NAME="${0##*.}"
+
 	case "$APACHE2_MAINTSCRIPT_NAME" in
 		preinst|prerm|postrm|postinst)
 			# yay - recognized script
@@ -86,8 +88,11 @@ else
 		;;
 	esac
 
-	APACHE2_MAINTSCRIPT_PACKAGE="${0##*/}"
-	APACHE2_MAINTSCRIPT_PACKAGE="${APACHE2_MAINTSCRIPT_PACKAGE%.*}"
+	APACHE2_MAINTSCRIPT_PACKAGE="$DPKG_MAINTSCRIPT_PACKAGE"
+	if [ -z "$APACHE2_MAINTSCRIPT_PACKAGE" ]; then
+		APACHE2_MAINTSCRIPT_PACKAGE="${0##*/}"
+		APACHE2_MAINTSCRIPT_PACKAGE="${APACHE2_MAINTSCRIPT_PACKAGE%.*}"
+	fi
 
 	APACHE2_MAINTSCRIPT_METHOD="$1"
 	APACHE2_MAINTSCRIPT_ARGUMENT="${2:-}"

-- 
Debian packaging for apache2