From 781cacd451d6fdd0f8b9c03c9651726f3cac8743 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Sat, 15 Feb 2014 18:52:33 +0000 Subject: [PATCH] debian/copyright updates; clscan: fix formatting --- debian/clscan/clscan | 645 +++++++++++++++++++++++---------------------- debian/clscan/copyright.in | 11 +- debian/clscan/files.yaml | 7 +- debian/copyright | 19 +- 4 files changed, 342 insertions(+), 340 deletions(-) diff --git a/debian/clscan/clscan b/debian/clscan/clscan index 0e427e203..4d2ffd4f7 100755 --- a/debian/clscan/clscan +++ b/debian/clscan/clscan @@ -65,42 +65,56 @@ my $lgpl3_boilerplate=<<"EOL"; EOL # license overrides as specified in modules/* -our $module_licenses = { - "public domain" => { - license => "PD", - license_text => "", - }, - "unlimited" => { - license => "other", - license_text => "This file is free software; the Free Software Foundation\n" . - "gives unlimited permission to copy and/or distribute it,\n" . - "with or without modifications, as long as this notice is preserved.\n", - }, - "LGPL" => { - license => "LGPL", - license_text => $lgpl3_boilerplate, - }, - "LGPLv2+" => { - license => "LGPL-2+", - license_text => $lgpl2_boilerplate, - }, - "LGPLv3+" => { - license => "LGPL-3+", - license_text => $lgpl3_boilerplate, - }, - "unmodifiable license text" => { - license => "other", - license_text => "Everyone is permitted to copy and distribute verbatim copies\n" . - "of this license document, but changing it is not allowed.\n", - }, - "GPLed build tool" => { - license => "GPL", - license_text => $gpl_boilerplate, - }, - "GPL" => { - license => "GPL", - license_text => $gpl_boilerplate, - }, +our $module_licenses = +{ + "public domain" => + { + license => "PD", + license_text => "", + }, + "unlimited" => + { + license => "other", + license_text => ("This file is free software; the Free Software Foundation\n" . + "gives unlimited permission to copy and/or distribute it,\n" . + "with or without modifications, as long as this notice is preserved.\n"), + }, + "LGPL" => + { + license => "LGPL", + license_text => $lgpl3_boilerplate, + }, + "LGPLv2+" => + { + license => "LGPL-2+", + license_text => $lgpl2_boilerplate, + }, + "LGPLv3" => + { + license => "LGPL-3", + license_text => $lgpl3_boilerplate, + }, + "LGPLv3+" => + { + license => "LGPL-3+", + license_text => $lgpl3_boilerplate, + }, + "unmodifiable license text" => + { + license => "other", + license_text => ("Everyone is permitted to copy and distribute verbatim copies\n" . + "of this license document, but changing it is not allowed.\n"), + }, + "GPLed build tool" => + { + license => "GPL", + license_text => $gpl_boilerplate, + }, + "GPL" => + { + license => "GPL", + license_text => $gpl_boilerplate, + }, }; our @filenames=(); @@ -117,9 +131,9 @@ my $writecopyright=0; usage() unless(@ARGV); usage() unless GetOptions("scan|s" => \$scan, - "merge|m" => \$merge, - "write|w" => \$writecopyright, - "help|h" => \$help); + "merge|m" => \$merge, + "write|w" => \$writecopyright, + "help|h" => \$help); usage() if $help; load_cache(); @@ -133,7 +147,7 @@ sub scan get_filenames(); for my $file (@filenames) { - scan_file($file); + scan_file($file); } find_deleted(); write_new(); @@ -150,70 +164,70 @@ sub write_copyright { unless(keys(%$files)) { - die("$me: no files known, run $0 --scan\n"); + die("$me: no files known, run $0 --scan\n"); } unless(copy($COPYRIGHTSTUB, "debian/copyright")) { - die("$me: cannot copy $COPYRIGHTSTUB to debian/copyright: $!\n"); + die("$me: cannot copy $COPYRIGHTSTUB to debian/copyright: $!\n"); } unless(open(COPYRIGHT, ">>debian/copyright")) { - die("$me: cannot append to debian/copyright: $!\n"); + die("$me: cannot append to debian/copyright: $!\n"); } # group files by license/license_text/copyright my $licenses={}; for my $file (sort keys(%$files)) { - my $license=$files->{$file}->{license_override} || $files->{$file}->{license}; - my $copyright=$files->{$file}->{copyright}; - my $license_text=$files->{$file}->{license_text_override} || - $files->{$file}->{license_text}; - push(@{$licenses->{$license}->{$license_text}->{$copyright}}, $file); + my $license=$files->{$file}->{license_override} || $files->{$file}->{license}; + my $copyright=$files->{$file}->{copyright}; + my $license_text=$files->{$file}->{license_text_override} || + $files->{$file}->{license_text}; + push(@{$licenses->{$license}->{$license_text}->{$copyright}}, $file); } my %refs=(); my $refnum="00"; print COPYRIGHT license_trailer(sort keys(%$licenses)); for my $license (sort keys(%$licenses)) { - for my $license_text (sort keys(%{$licenses->{$license}})) - { - my $licensestr=$license; - if(length($license_text)) - { - $refnum++; - # license_text + empty license = License: other - if(!length($license)) - { - $licensestr = "other"; - } - $licensestr .= " [REF$refnum]"; - $refs{$licensestr}=$license_text; - } + for my $license_text (sort keys(%{$licenses->{$license}})) + { + my $licensestr=$license; + if(length($license_text)) + { + $refnum++; + # license_text + empty license = License: other + if(!length($license)) + { + $licensestr = "other"; + } + $licensestr .= " [REF$refnum]"; + $refs{$licensestr}=$license_text; + } else { if(!length($license)) { $licensestr="unknown"; } } - for my $copyright (sort keys(%{$licenses->{$license}->{$license_text}})) - { - next if(!length($license) && !length($copyright) && !length($license_text)); - my @filelist=sort @{$licenses->{$license}->{$license_text}->{$copyright}}; - print COPYRIGHT "Files: ", join(' ', @filelist), "\n"; - print COPYRIGHT "Copyright: ". (length($copyright) ? $copyright : "unknown" ) . "\n"; - print COPYRIGHT "License: $licensestr\n" if length($licensestr); - print COPYRIGHT "\n"; - } - } + for my $copyright (sort keys(%{$licenses->{$license}->{$license_text}})) + { + next if(!length($license) && !length($copyright) && !length($license_text)); + my @filelist=sort @{$licenses->{$license}->{$license_text}->{$copyright}}; + print COPYRIGHT "Files: ", join(' ', @filelist), "\n"; + print COPYRIGHT "Copyright: ". (length($copyright) ? $copyright : "unknown" ) . "\n"; + print COPYRIGHT "License: $licensestr\n" if length($licensestr); + print COPYRIGHT "\n"; + } + } } for my $ref (sort byref keys(%refs)) { - print COPYRIGHT "License: $ref\n"; - my @text=split(/\n/, $refs{$ref}); + print COPYRIGHT "License: $ref\n"; + my @text=split(/\n/, $refs{$ref}); @text=map { ($_ eq "") ? "." : $_; } @text; - print COPYRIGHT map { " " . $_ . "\n" } @text; - print COPYRIGHT "\n"; + print COPYRIGHT map { " " . $_ . "\n" } @text; + print COPYRIGHT "\n"; } close(COPYRIGHT); } @@ -224,7 +238,7 @@ sub byref my $bref=($b=~/\[REF(\d+)\]/)[0]; if($aref && $bref) { - return($aref <=> $bref); + return($aref <=> $bref); } return($a cmp $b); } @@ -232,50 +246,51 @@ sub byref sub license_trailer { my @licenses_used=@_; - my $license_data = { - "Apache-2.0" => "Apache License Version 2.0", - "Artistic" => "Artistic License", - "GFDL-1.2" => "GNU Free Documentation License Version 1.2", - "GFDL-1.3" => "GNU Free Documentation License Version 1.3", - "GFDL" => "GNU Free Documentation License", - "GPL-2" => "GNU General Public License Version 2", - "GPL-3" => "GNU General Public License Version 3", - "GPL" => "GNU General Public License", - "LGPL-2" => "GNU Library General Public License Version 2", - "LGPL-2.1" => "GNU Lesser General Public License Version 2.1", - "LGPL-3" => "GNU Lesser General Public License Version 3", - "LGPL" => "GNU Lesser General Public License", + my $license_data = + { + "Apache-2.0" => "Apache License Version 2.0", + "Artistic" => "Artistic License", + "GFDL-1.2" => "GNU Free Documentation License Version 1.2", + "GFDL-1.3" => "GNU Free Documentation License Version 1.3", + "GFDL" => "GNU Free Documentation License", + "GPL-2" => "GNU General Public License Version 2", + "GPL-3" => "GNU General Public License Version 3", + "GPL" => "GNU General Public License", + "LGPL-2" => "GNU Library General Public License Version 2", + "LGPL-2.1" => "GNU Lesser General Public License Version 2.1", + "LGPL-3" => "GNU Lesser General Public License Version 3", + "LGPL" => "GNU Lesser General Public License", }; my %types_found=(); for my $type (reverse sort keys(%$license_data)) { - for my $license (@licenses_used) - { - if($license =~ /$type(\+|\s|$)/i) - { - $types_found{$type}=1; - } - } + for my $license (@licenses_used) + { + if($license =~ /$type(\+|\s|$)/i) + { + $types_found{$type}=1; + } + } } my $text=" .\n"; # if just one, use standard style if(keys(%types_found) == 1) { - my ($file, $name)=each(%types_found); - $text .= " The complete text of the $name can be\n"; - $text .= " found in /usr/share/common-licenses/$file\n"; + my ($file, $name)=each(%types_found); + $text .= " The complete text of the $name can be\n"; + $text .= " found in /usr/share/common-licenses/$file\n"; } else { - # more than one, use table. - $text .= " The complete text of standard licenses referenced above\n"; - $text .= " can be found in /usr/share/common-licenses/ as follows:\n .\n "; - $text .= sprintf("%-60s %s\n", "LICENSE", "FILE"); - for my $type (sort keys(%types_found)) - { - $text .= sprintf(" %-60s %s\n", $license_data->{$type}, $type); - } + # more than one, use table. + $text .= " The complete text of standard licenses referenced above\n"; + $text .= " can be found in /usr/share/common-licenses/ as follows:\n .\n "; + $text .= sprintf("%-60s %s\n", "LICENSE", "FILE"); + for my $type (sort keys(%types_found)) + { + $text .= sprintf(" %-60s %s\n", $license_data->{$type}, $type); + } } $text .= "\n\n"; return $text; @@ -289,27 +304,27 @@ sub guess_license my $copyright=''; if(open(LICENSECHECK, "licensecheck --copyright \"$file\"|")) { - while() - { - chomp; - if(/^\s+\[(.*)\]$/) - { - $copyright=$1; - } - elsif(/.*:\s+(.*)/) - { - $license=$1; - } - } - close(LICENSECHECK); - $copyright =~ s/^\s*Copyright\s*:\s*//; - $license =~ s/.*UNKNOWN.*//; - $license =~ s/(L?GPL) \(v([\.\d]+) or later\)/$1-$2+/i; - $license =~ s/(L?GPL) \(v([\.\d]+)\)/$1-$2/i; - $license =~ s/G?FDL \(v([\.\d]+) or later\)/GFDL-$1+/i; - $license =~ s/G?FDL \(v([\.\d]+)\)/GFDL-$1/i; - $license =~ s/Apache \(v([\.\d]+) or later\)/Apache-$1+/i; - $license =~ s/Apache \(v([\.\d]+)\)/Apache-$1+/i; + while() + { + chomp; + if(/^\s+\[(.*)\]$/) + { + $copyright=$1; + } + elsif(/.*:\s+(.*)/) + { + $license=$1; + } + } + close(LICENSECHECK); + $copyright =~ s/^\s*Copyright\s*:\s*//; + $license =~ s/.*UNKNOWN.*//; + $license =~ s/(L?GPL) \(v([\.\d]+) or later\)/$1-$2+/i; + $license =~ s/(L?GPL) \(v([\.\d]+)\)/$1-$2/i; + $license =~ s/G?FDL \(v([\.\d]+) or later\)/GFDL-$1+/i; + $license =~ s/G?FDL \(v([\.\d]+)\)/GFDL-$1/i; + $license =~ s/Apache \(v([\.\d]+) or later\)/Apache-$1+/i; + $license =~ s/Apache \(v([\.\d]+)\)/Apache-$1+/i; } return($license, $copyright); } @@ -319,22 +334,22 @@ sub scan_file my $filename=shift; unless(open(FILE, $filename)) { - warn("$me: $filename: cannot open: $!\n"); - return; + warn("$me: $filename: cannot open: $!\n"); + return; } my $header=''; for(my $i=0; $i < 15; $i++) { - my $line=; - last unless($line); - $header .= $line; + my $line=; + last unless($line); + $header .= $line; } close(FILE); my $hash=sha256_hex($header); if( (!exists($files->{$filename})) || - ($files->{$filename}->{hash} ne $hash)) + ($files->{$filename}->{hash} ne $hash)) { - filechanged($filename, $hash, $header); + filechanged($filename, $hash, $header); } } @@ -343,28 +358,29 @@ sub filechanged { my($filename, $hash, $header)=@_; my($license_guess, $copyright_guess)=guess_license($filename); - $new->{$filename}={ - hash=>$hash, - license=>$license_guess, - copyright=>$copyright_guess, - header=>$header, + $new->{$filename}= + { + hash=>$hash, + license=>$license_guess, + copyright=>$copyright_guess, + header=>$header }; if(exists($files->{$filename})) { - if(exists($files->{$filename}->{copyright})) - { - $new->{$filename}->{copyright}=$files->{$filename}->{copyright}; - $new->{$filename}->{copyright_guess}=$copyright_guess; - } - if(exists($files->{$filename}->{license})) - { - $new->{$filename}->{license}=$files->{$filename}->{license}; - $new->{$filename}->{license_guess}=$license_guess; - } - if(exists($files->{$filename}->{license_text})) - { - $new->{$filename}->{license_text}=$files->{$filename}->{license_text}; - } + if(exists($files->{$filename}->{copyright})) + { + $new->{$filename}->{copyright}=$files->{$filename}->{copyright}; + $new->{$filename}->{copyright_guess}=$copyright_guess; + } + if(exists($files->{$filename}->{license})) + { + $new->{$filename}->{license}=$files->{$filename}->{license}; + $new->{$filename}->{license_guess}=$license_guess; + } + if(exists($files->{$filename}->{license_text})) + { + $new->{$filename}->{license_text}=$files->{$filename}->{license_text}; + } } } @@ -377,11 +393,11 @@ sub wanted_files { if(/^\.git/ || /^\.cvs/ || /^debian/ || /^modules$/ || /^\.pc/) { - $File::Find::prune=1; + $File::Find::prune=1; } elsif(-f) { - push(@filenames, $File::Find::name); + push(@filenames, $File::Find::name); } } @@ -389,45 +405,45 @@ sub wanted_modules { if(/^\.[^\/]/ || /^README$/ || /^COPYING$/) { - $File::Find::prune=1; - return; + $File::Find::prune=1; + return; } elsif(-f) { - unless(open(MOD, $File::Find::name)) - { - warn("$me: cannot open $File::Find::name: $!\n"); - return; - } - my $infiles=0; - my $inlicense=0; - my @files=(); - while() - { - chomp; - if(/^$/) - { - $infiles = $inlicense = 0; - } - if($inlicense) - { - push(@{$overrides{$_}},@files); - $inlicense=0; - } - elsif($infiles) - { - push(@files, $_); - } - elsif(/^License:/) - { - $inlicense=1; - } - elsif(/^Files:/) - { - $infiles=1; - } - } - close(MOD); + unless(open(MOD, $File::Find::name)) + { + warn("$me: cannot open $File::Find::name: $!\n"); + return; + } + my $infiles=0; + my $inlicense=0; + my @files=(); + while() + { + chomp; + if(/^$/) + { + $infiles = $inlicense = 0; + } + if($inlicense) + { + push(@{$overrides{$_}},@files); + $inlicense=0; + } + elsif($infiles) + { + push(@files, $_); + } + elsif(/^License:/) + { + $inlicense=1; + } + elsif(/^Files:/) + { + $infiles=1; + } + } + close(MOD); } } @@ -436,23 +452,23 @@ sub load_overrides find({ wanted => \&wanted_modules, no_chdir => 1}, "modules/"); for my $license (keys(%overrides)) { - if(!exists($module_licenses->{$license})) - { - die("$me: license override \"$license\" not found in \$module_licenses\n"); - } - my @overridden_files=map { "./" . $_; } @{$overrides{$license}}; - for my $file (@overridden_files) - { - my $override=$module_licenses->{$license}; - if(length($override->{license})) - { - $files->{$file}->{license_override}=$override->{license}; - } - if(length($override->{license_text})) - { - $files->{$file}->{license_text_override}=$override->{license_text}; - } - } + if(!exists($module_licenses->{$license})) + { + die("$me: license override \"$license\" not found in \$module_licenses\n"); + } + my @overridden_files=map { "./" . $_; } @{$overrides{$license}}; + for my $file (@overridden_files) + { + my $override=$module_licenses->{$license}; + if(length($override->{license})) + { + $files->{$file}->{license_override}=$override->{license}; + } + if(length($override->{license_text})) + { + $files->{$file}->{license_text_override}=$override->{license_text}; + } + } } } @@ -461,13 +477,13 @@ sub load_cache { unless(open(YAML,$FILESCACHE)) { - warn("$me: cannot load cache $FILESCACHE: $!\n"); - return; + warn("$me: cannot load cache $FILESCACHE: $!\n"); + return; } my $yaml; { - local $/=undef; - $yaml=; + local $/=undef; + $yaml=; } close(YAML); $files=Load($yaml); @@ -478,8 +494,8 @@ sub save_cache backup($FILESCACHE); unless(open(YAML,">$FILESCACHE")) { - warn("$me: cannot save cache $FILESCACHE: $!\n"); - return; + warn("$me: cannot save cache $FILESCACHE: $!\n"); + return; } print YAML Dump($files); close(YAML); @@ -490,40 +506,40 @@ sub write_new backup($NEWFILES); unless(keys(%$new)) { - warn("$me: no new/changed files found\n"); + warn("$me: no new/changed files found\n"); } unless(open(NEW,">$NEWFILES")) { - die("$me: cannot write to $NEWFILES: $!\n"); + die("$me: cannot write to $NEWFILES: $!\n"); } for my $file (sort keys %$new) { - print NEW "File: $file\n"; - print NEW "Hash: ", $new->{$file}->{hash}, "\n"; - print NEW "Copyright: ", $new->{$file}->{copyright}, "\n"; - if($new->{$file}->{copyright_guess}) - { - print NEW "#Copyright_guess: ", $new->{$file}->{copyright_guess}, "\n"; - } - print NEW "License: ", $new->{$file}->{license}, "\n"; - if($new->{$file}->{license_guess}) - { - print NEW "#License_guess: ", $new->{$file}->{license_guess}, "\n"; - } - if($new->{$file}->{license_text}) - { - my @text=split(/\n/, $new->{$file}->{license_text}); - print NEW "\t" . join("\n\t", @text), "\n"; - } - print NEW "#Header: \n"; - my @headerlines=split(/\n/, $new->{$file}->{header}); - @headerlines=map { "#" . $_ } grep { defined $_; } @headerlines; - print NEW join("\n", @headerlines); - print NEW "\n\n"; + print NEW "File: $file\n"; + print NEW "Hash: ", $new->{$file}->{hash}, "\n"; + print NEW "Copyright: ", $new->{$file}->{copyright}, "\n"; + if($new->{$file}->{copyright_guess}) + { + print NEW "#Copyright_guess: ", $new->{$file}->{copyright_guess}, "\n"; + } + print NEW "License: ", $new->{$file}->{license}, "\n"; + if($new->{$file}->{license_guess}) + { + print NEW "#License_guess: ", $new->{$file}->{license_guess}, "\n"; + } + if($new->{$file}->{license_text}) + { + my @text=split(/\n/, $new->{$file}->{license_text}); + print NEW "\t" . join("\n\t", @text), "\n"; + } + print NEW "#Header: \n"; + my @headerlines=split(/\n/, $new->{$file}->{header}); + @headerlines=map { "#" . $_ } grep { defined $_; } @headerlines; + print NEW join("\n", @headerlines); + print NEW "\n\n"; } if(@deleted_files) { - print NEW map { "Deleted: $_\n"; } @deleted_files; + print NEW map { "Deleted: $_\n"; } @deleted_files; } close NEW; } @@ -532,7 +548,7 @@ sub merge_new { unless(open(NEW, $NEWFILES)) { - die("$me: $NEWFILES: cannot open: $!\n"); + die("$me: $NEWFILES: cannot open: $!\n"); } my $license=''; my $copyright=''; @@ -543,69 +559,70 @@ sub merge_new my $line=0; while() { - $line++; - chomp; - next if(/^\s*\#/); - if($in_license_text && /^\s+(.*)/) - { - $license_text .= $1 . "\n"; - } - elsif(/^\s*$/) - { - next; - } - elsif(/^File:\s*(.*)/) - { - my $newfile=$1; - # save previous entry - if(length($file) && length($hash)) - { - $files->{$file}={ hash=>$hash, - copyright=>$copyright, - license=>$license, - license_text=>$license_text }; - } - $file=$newfile; - $license=''; - $copyright=''; - $hash=''; - $license_text=''; - $in_license_text = 0; - } - elsif(/^Hash:\s*(.*)/) - { - $hash=$1; - } - elsif(/^Copyright:\s*(.*)/) - { - $copyright=$1; - } - elsif(/^License:\s*(.*)/) - { - $license=$1; - $in_license_text=1; - $license_text=''; - } - elsif(/^Deleted:\s*(.*)/) - { - if(exists($files->{$1})) - { - delete($files->{$1}); - } - } - else - { - warn("$me: $NEWFILES: line $line not recognized\n"); - } + $line++; + chomp; + next if(/^\s*\#/); + if($in_license_text && /^\s+(.*)/) + { + $license_text .= $1 . "\n"; + } + elsif(/^\s*$/) + { + next; + } + elsif(/^File:\s*(.*)/) + { + my $newfile=$1; + # save previous entry + if(length($file) && length($hash)) + { + $files->{$file}={ + hash=>$hash, + copyright=>$copyright, + license=>$license, + license_text=>$license_text }; + } + $file=$newfile; + $license=''; + $copyright=''; + $hash=''; + $license_text=''; + $in_license_text = 0; + } + elsif(/^Hash:\s*(.*)/) + { + $hash=$1; + } + elsif(/^Copyright:\s*(.*)/) + { + $copyright=$1; + } + elsif(/^License:\s*(.*)/) + { + $license=$1; + $in_license_text=1; + $license_text=''; + } + elsif(/^Deleted:\s*(.*)/) + { + if(exists($files->{$1})) + { + delete($files->{$1}); + } + } + else + { + warn("$me: $NEWFILES: line $line not recognized\n"); + } } close(NEW); # save last entry if(length($file) && length($hash)) { - $files->{$file}={ hash=>$hash, - copyright=>$copyright, - license=>$license, - license_text=>$license_text }; + $files->{$file}={ hash=>$hash, + copyright=>$copyright, + license=>$license, + license_text=>$license_text }; } } @@ -614,15 +631,15 @@ sub find_deleted my %newnames = map { $_ => 1 } @filenames; for my $file (sort keys(%$files)) { - unless(exists($newnames{$file})) - { - push(@deleted_files, $file); - } + unless(exists($newnames{$file})) + { + push(@deleted_files, $file); + } } if(@deleted_files) { - print "Removed files:\n"; - print join("\n", @deleted_files),"\n"; + print "Removed files:\n"; + print join("\n", @deleted_files),"\n"; } } @@ -632,18 +649,18 @@ sub backup my $old="$base.old"; if(-f $base) { - unlink($base); - move($base, $old); + unlink($base); + move($base, $old); } } sub usage { die("usage: $me [--scan] [--merge]\n", - "scans for changed copyright/licenses\n", - " -s|-scan Scan for new files & files with changed copyright headers\n", - " Writes to debian/clscan/new.txt for manual review.\n", - " -m|--merge Merges new data from debian/clscan/new.txt\n", - " -w|--write Writes updated debian/copyright.\n", - " --merge implies --write.\n"); + "scans for changed copyright/licenses\n", + " -s|-scan Scan for new files & files with changed copyright headers\n", + " Writes to debian/clscan/new.txt for manual review.\n", + " -m|--merge Merges new data from debian/clscan/new.txt\n", + " -w|--write Writes updated debian/copyright.\n", + " --merge implies --write.\n"); } diff --git a/debian/clscan/copyright.in b/debian/clscan/copyright.in index b1ecc72ee..4c832e10f 100644 --- a/debian/clscan/copyright.in +++ b/debian/clscan/copyright.in @@ -26,27 +26,26 @@ License: in the gnulib source package for information on updating this. Files: debian/* -Copyright: 2009-2013 Ian Beckwith +Copyright: 2009-2014 Ian Beckwith 2006-2008 Daniel Baumann License: GPL-2 Files: modules/* -Copyright: 2002-2007 Free Software Foundation, Inc. +Copyright: 2002-2014 Free Software Foundation, Inc. License: other From modules/README: > All the files in this directory are distributed under the following copyright: > - > Copyright (C) 2002-2007 Free Software Foundation, Inc. + > Copyright (C) 2002-2014 Free Software Foundation, Inc. > Copying and distribution of this file, with or without modification, > in any medium, are permitted without royalty provided the copyright > notice and this notice are preserved. - . + . From modules/COPYING: - > The files in this directory describe the gnulib modules. > The following copyright notice applies to each of these > description files. > - > Copyright (C) 2006 Free Software Foundation, Inc. + > Copyright (C) 2002-2014 Free Software Foundation, Inc. > This file is free software; the Free Software Foundation > gives unlimited permission to copy and/or distribute it, > with or without modifications, as long as this notice is preserved. diff --git a/debian/clscan/files.yaml b/debian/clscan/files.yaml index 40efb166e..cd7aadba2 100644 --- a/debian/clscan/files.yaml +++ b/debian/clscan/files.yaml @@ -6478,7 +6478,7 @@ ' ./doc/intprops.texi: - copyright: 2011-2014 Free Software Foundation, Inc. + copyright: '' hash: c5915659b799cc52d23d27beb032b0480236165128e785c31f2fc1f94c6dd9cd license: '' license_text: '' @@ -13309,11 +13309,6 @@ along with this program. If not, see . ' -./gnulib-tool.rej: - copyright: $year Free Software Foundation, Inc - hash: a4df276a3d8aa37ab0f51730ecd96e4e9b62d587118cc5f585dff4ad4eaf6905 - license: '' - license_text: '' ./lib/.cppi-disable: copyright: '' hash: ed4ff8357c74f26ce7298059529040adbec140e2aff3512d6f0218a9df753e79 diff --git a/debian/copyright b/debian/copyright index 6ada0a010..beccbcc93 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,27 +26,26 @@ License: in the gnulib source package for information on updating this. Files: debian/* -Copyright: 2009-2013 Ian Beckwith +Copyright: 2009-2014 Ian Beckwith 2006-2008 Daniel Baumann License: GPL-2 Files: modules/* -Copyright: 2002-2007 Free Software Foundation, Inc. +Copyright: 2002-2014 Free Software Foundation, Inc. License: other From modules/README: > All the files in this directory are distributed under the following copyright: > - > Copyright (C) 2002-2007 Free Software Foundation, Inc. + > Copyright (C) 2002-2014 Free Software Foundation, Inc. > Copying and distribution of this file, with or without modification, > in any medium, are permitted without royalty provided the copyright > notice and this notice are preserved. - . + . From modules/COPYING: - > The files in this directory describe the gnulib modules. > The following copyright notice applies to each of these > description files. > - > Copyright (C) 2006 Free Software Foundation, Inc. + > Copyright (C) 2002-2014 Free Software Foundation, Inc. > This file is free software; the Free Software Foundation > gives unlimited permission to copy and/or distribute it, > with or without modifications, as long as this notice is preserved. @@ -64,14 +63,6 @@ License: other GNU Lesser General Public License Version 3 LGPL-3 -Files: ./gnulib-tool.rej -Copyright: $year Free Software Foundation, Inc -License: unknown - -Files: ./doc/intprops.texi -Copyright: 2011-2014 Free Software Foundation, Inc. -License: unknown - Files: ./doc/solaris-versions Copyright: 2003, 2005, 2006 Free Software Foundation, Inc. License: other [REF01] -- 2.11.0