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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e1b02358a7063a3de1e57926d7590a022e82ea13
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Feb 15 15:06:48 2010 +0100

    Improve copyright-check.mk: Limit console output to 60 chars wide and 200 lines long, and improve wording of trailing instructions.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index fef79fe..560ed0b 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -112,13 +112,17 @@ debian/stamp-copyright-check:
 	@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/^\+//'`; \
 		if [ -n "$$newstrings" ]; then \
-			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \
+			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following (and possibly more) new or changed notices discovered:"; \
 			echo; \
-			echo "$$newstrings" | perl -pe 's/[^[:print:][:space:]]//g'; \
+			echo "$$newstrings" \
+				| perl -ne '/^.{0,60}$$/ or s/^(.{0,60})\b.*$$/$$1…/;s/[^[:print:][:space:]…]//g;$$_ ne $$prev and (($$prev) = $$_) and print' \
+				| sort -m \
+				| head -n 200; \
 			echo; \
 			echo "To fix the situation please do the following:"; \
-			echo "  1) Investigate the above changes and update debian/copyright as needed"; \
-			echo "  2) Replace debian/copyright_hints with debian/copyright_newhints"; \
+			echo "  1) Fully compare debian/copyright_hints with debian/copyright_newhints"; \
+			echo "  2) Update debian/copyright as needed"; \
+			echo "  3) Replace debian/copyright_hints with debian/copyright_newhints"; \
 			$(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \
 		else \
 			echo 'No new copyright notices found - assuming no news is good news...'; \

-- 
hydrogen packaging