[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 11d80339a1675787e0b2fb3209deea5655925c33
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 19 16:44:19 2010 +0100

    Group by owners (ignoring years) and sort owner list by years in copyright-check.mk.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index 958a8e6..c4bd0a8 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -76,19 +76,23 @@ debian/stamp-copyright-check:
 	'	$$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*$$//;'\
-	'	$$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\
-	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
+	'	@ownerlines = split /(?:\s+\/|\Z)\s*/, $$file->{copyright};'\
+	'	@owners = grep {/[^\s\d,].*$$/} @ownerlines;'\
+	'	$$pattern = join ("\n", $$file->{license}, sort @owners);'\
 	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
+	'	push @{ $$patternownerlines{"$$pattern"} }, @ownerlines;'\
+	'	$$patternlicense{"$$pattern"} = $$file->{license};'\
 	'};'\
 	'foreach $$pattern ( sort {'\
 	'			@{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\
+	'	$$ownerline_prev = "dummy text";'\
+	'	@ownerlines_unique = grep($$_ ne $$prev && (($$prev) = $$_), sort @{ $$patternownerlines{$$pattern} });'\
 	'	print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
-	'	print "Copyright: $$copyright\n";'\
-	'	print "License: $$license\n\n";'\
+	'	print "Copyright: ", join("\n\t", @ownerlines_unique), "\n";'\
+	'	print "License: $$patternlicense{$$pattern}\n\n";'\
 	'};'\
 		> debian/copyright_newhints
 	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \

-- 
calf audio plugins packaging