[SCM] hydrogen packaging branch, master, updated. 1f8e4361335aef5d223885927c688d654b9566e2

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0f5464e66b9a1aaf6ce8f2544b91789a7fd5a52f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Mar 2 16:42:31 2010 +0100

    Fix force use LC_ALL=C in copyright-check.mk.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index b81109e..7ae8076 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -52,8 +52,8 @@ debian/stamp-copyright-check:
 # Perl in shell in make requires extra care:
 #  * Single-quoting ('...') protects against shell expansion
 #  * Double-dollar ($$) expands to plain dollar ($) in make
-	@$(DEB_COPYRIGHT_CHECK_INVOKE) \
-		| LC_ALL=C perl -e \
+	@export LC_ALL=C; $(DEB_COPYRIGHT_CHECK_INVOKE) \
+		| perl -e \
 	'print "Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135\n";'\
 	'print "X-Draft: Autogenerated by CDBS snippet copyright-check.mk\n\n";'\
 	'$$n=0; while (<>) {'\
@@ -106,10 +106,10 @@ debian/stamp-copyright-check:
 	'	print "License: $$patternlicense{$$pattern}\n FIXME\n\n";'\
 	'};'\
 		> debian/copyright_newhints
-	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
+	@export LC_ALL=C; patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | sort -u | grep . -c -`"; \
 		echo "Found $$patterncount different copyright and licensing combinations."
 	@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
-	@newstrings=`diff -a -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep -a '^\+' - | sed 's/^\+//'`; \
+	@export LC_ALL=C; newstrings=`diff -a -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep -a '^\+' - | sed 's/^\+//'`; \
 		if [ -n "$$newstrings" ]; then \
 			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following (and possibly more) new or changed notices discovered:"; \
 			echo; \

-- 
hydrogen packaging