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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit db51e9be21e845adf6594ceaab6e294f1b297955
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Feb 14 14:55:19 2010 +0100

    Fix strip unusual characters in terminal output.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index 511c884..dc1e2e7 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -100,11 +100,11 @@ debian/stamp-copyright-check:
 	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C 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 -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
+	@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 new or changed copyright notices discovered:"; \
 			echo; \
-			echo "$$newstrings" | cat -v; \
+			echo "$$newstrings" | perl -pe 's/[^[:print:][:space:]]//g'; \
 			echo; \
 			echo "To fix the situation please do the following:"; \
 			echo "  1) Investigate the above changes and update debian/copyright as needed"; \

-- 
hydrogen packaging