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

Arno Töll arno at debian.org
Fri Jun 7 16:45:33 UTC 2013


The following commit has been merged in the master branch:
commit 9b44c6072a36e2f5eeb0ec728b199a71ef3c7ff1
Author: Arno Töll <arno at debian.org>
Date:   Fri Jun 7 14:10:55 2013 +0200

    Send output of apache2-maintscript-helper to stderr, instead of stdout. Thanks to Robert Luberda for a patch

diff --git a/debian/changelog b/debian/changelog
index 74e0e84..ff59d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,10 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
   * Fix "apache2-dev: dh-apache2 does not strip .conf extension" for modules
     relying on the install heuristic, instead of writing an *.apache2 conf
     file (Closes: #711483)
+  * Apply patch submitted by Robert Luberda and redirect all output of
+    apache2-maintscript-helper to stderr (Closes: #711478)
 
- -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 14:02:14 +0200
+ -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 14:09:17 +0200
 
 apache2 (2.4.4-5) unstable; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 492fcdc..b313496 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -71,7 +71,7 @@ else
 
 
 	if [ -z "$1" ] ; then
-		echo "You must invoke apache2-maintscript-helper with an unmodified environment when sourcing it"
+		echo "You must invoke apache2-maintscript-helper with an unmodified environment when sourcing it" >&2
 		return 1
 	fi
 
@@ -81,7 +81,7 @@ else
 			# yay - recognized script
 		;;
 		*)
-			echo "Invoked from an unrecognized maintainer script: exiting"
+			echo "apache2-maintscript-helper invoked from an unrecognized maintainer script: exiting" >&2
 			return 1
 		;;
 	esac
@@ -126,7 +126,7 @@ apache2_msg()
 {
 	local PRIORITY="$1"
 	local MSG="$2"
-	[ -z "$APACHE2_MAINTSCRIPT_HELPER_QUIET" ] && echo "$MSG"
+	[ -z "$APACHE2_MAINTSCRIPT_HELPER_QUIET" ] && echo "$MSG" >&2
 	[ -x /usr/bin/logger ] || return 0
 	case "$PRIORITY" in
 		debug|info|notice|warning|err|crit|alert|emerg)

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list