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

[js at users.alioth.debian.org]

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

    Strip some common noise from output of copyright-check.mk.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index dc1e2e7..88f2503 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -64,25 +64,31 @@ debian/stamp-copyright-check:
 	'	/^$$/ and $$n++;'\
 	'};'\
 	'foreach $$file (@files) {'\
+	'	$$file->{license} =~ s/\s*\(unversioned\/unknown version\)//;'\
 	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
 	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
 	'	$$file->{license} =~ s/\s+\(v([^)]+)\)/-$$1/;'\
 	'	$$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\
 	'	$$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN/;'\
 	'	$$file->{license} =~ s/\s+(GENERATED FILE)//;'\
+	'	$$file->{copyright} =~ s/^&copy;\s*//;'\
 	'	$$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
 	'	$$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
 	'	$$file->{copyright} =~ s/\b(\d{4}),?\s+([\S^\d])/$$1, $$2/g;'\
 	'	my @ownerlines = grep {/\w\w/} split /\s\/\s/, $$file->{copyright};'\
+	'	my @ownerlines_clean = ();'\
 	'	my %owneryears = ();'\
 	'	for $$ownerline ( @ownerlines ) {'\
 	'		my ($$owneryear, $$owner) = $$ownerline =~ /^([\d-,\s]*)\s*+(.*)/;'\
+	'		$$owner =~ s/^by\s+//;'\
+	'		$$owner =~ s/,?\s+All Rights Reserved\.?//gi;'\
+	'		push @ownerlines_clean, "$$owneryear$$owner";'\
 	'		push @{ $$owneryears{"$$owner"} }, $$owneryear;'\
 	'	};'\
 	'	my @owners = sort keys %owneryears;'\
 	'	my $$pattern = join ("\n", $$file->{license}, @owners);'\
 	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
-	'	push @{ $$patternownerlines{"$$pattern"} }, @ownerlines;'\
+	'	push @{ $$patternownerlines{"$$pattern"} }, @ownerlines_clean;'\
 	'	$$patternlicense{"$$pattern"} = $$file->{license};'\
 	'};'\
 	'foreach $$pattern ( sort {'\

-- 
hydrogen packaging