[SCM] calf audio plugins packaging branch, master, updated. upstream/0.0.18.5-48-g0119489

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c197fbe885260dbd19fcbf758e0276a255a1d989
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 9 03:33:15 2010 +0100

    Fix too aggressive grouping, lost owners, and wrong separation of years from owner, in copyright-check.mk.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index ed5dace..6f73fc7 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -73,11 +73,11 @@ debian/stamp-copyright-check:
 	'	$$file->{license} =~ s/\s+(GENERATED FILE)//;'\
 	'	$$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;'\
+	'	$$file->{copyright} =~ s/\b(\d{4}),?\s+([\S^\d])/$$1, $$2/g;'\
 	'	my @ownerlines = grep {/\w\w/} split /\s\/\s/, $$file->{copyright};'\
-	'	my %owneryears;'\
+	'	my %owneryears = ();'\
 	'	for $$ownerline ( @ownerlines ) {'\
-	'		my ($$owneryear, $$owner) = split /(?=\s)/, $$ownerline, 2;'\
+	'		my ($$owneryear, $$owner) = $$ownerline =~ /^([\d-,\s]*?)\s*(.*)/;'\
 	'		push @{ $$owneryears{"$$owner"} }, $$owneryear;'\
 	'	};'\
 	'	my @owners = sort keys %owneryears;'\
@@ -91,7 +91,7 @@ debian/stamp-copyright-check:
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	$$ownerline_prev = "dummy text";'\
+	'	my $$prev;'\
 	'	@ownerlines_unique = grep($$_ ne $$prev && (($$prev) = $$_), sort @{ $$patternownerlines{$$pattern} });'\
 	'	print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
 	'	print "Copyright: ", join("\n\t", @ownerlines_unique), "\n";'\

-- 
calf audio plugins packaging