[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 95c4051a7c4cd94d7ec333ed6f144617febeac27
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Feb 8 16:07:27 2010 +0100

    Group by sorted owner list (ignoring years) in copyright-check.mk.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index cbeb8dc..ed5dace 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -74,11 +74,14 @@ debian/stamp-copyright-check:
 	'	$$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/^\W*\s+\/\s+//g;'\
-	'	$$file->{copyright} =~ s/\s+\/\s+\W*$$//;'\
-	'	@ownerlines = split /(?:\s+\/|\Z)\s*/, $$file->{copyright};'\
-	'	@owners = grep {/[^\s\d,].*$$/} @ownerlines;'\
-	'	$$pattern = join ("\n", $$file->{license}, sort @owners);'\
+	'	my @ownerlines = grep {/\w\w/} split /\s\/\s/, $$file->{copyright};'\
+	'	my %owneryears;'\
+	'	for $$ownerline ( @ownerlines ) {'\
+	'		my ($$owneryear, $$owner) = split /(?=\s)/, $$ownerline, 2;'\
+	'		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;'\
 	'	$$patternlicense{"$$pattern"} = $$file->{license};'\

-- 
calf audio plugins packaging