[Pkg-doc-linux-devel] r250 - trunk/doc-linux/debian

[djpig at alioth.debian.org]

Author: djpig
Date: 2007-09-16 16:00:35 +0000 (Sun, 16 Sep 2007)
New Revision: 250

Modified:
   trunk/doc-linux/debian/diff-tarballs
Log:
diff-tarballs: Even more informative

Also find the license for each updated HOWTO, since I look that up anyway


Modified: trunk/doc-linux/debian/diff-tarballs
===================================================================
--- trunk/doc-linux/debian/diff-tarballs	2007-09-16 15:45:24 UTC (rev 249)
+++ trunk/doc-linux/debian/diff-tarballs	2007-09-16 16:00:35 UTC (rev 250)
@@ -14,6 +14,8 @@
 use strict;
 use warnings;
 
+use File::Basename;
+
 my @files;
 opendir my $dh, 'HOWTO' or die "E: couldn't open directory HOWTO: $!";
 while( my $f = readdir $dh ) {
@@ -109,9 +111,9 @@
     };
 }
 
-my @nonfree_list = qx'rgrep --exclude *.svn* ^HOWTO: debian/copyrights/non-free/ | perl -p -e "s/^\S+\s*//o" | sort | uniq';
-my @removed_list = qx'rgrep --exclude *.svn* ^HOWTO: debian/copyrights/removed/ | perl -p -e "s/^\S+\s*//o" | sort | uniq';
-my @undistributable_list = qx'rgrep --exclude *.svn* ^HOWTO: debian/copyrights/undistributable/ | perl -p -e "s/^\S+\s*//o" | sort | uniq';
+my @nonfree_list = qx'rgrep --exclude "*.svn*" ^HOWTO: debian/copyrights/non-free/ | perl -p -e "s/^\S+\s*//o" | sort | uniq';
+my @removed_list = qx'rgrep --exclude "*.svn*" ^HOWTO: debian/copyrights/removed/ | perl -p -e "s/^\S+\s*//o" | sort | uniq';
+my @undistributable_list = qx'rgrep --exclude "*.svn*" ^HOWTO: debian/copyrights/undistributable/ | perl -p -e "s/^\S+\s*//o" | sort | uniq';
 my %nonfree_list;
 my @nonfree_mentioned;
 foreach (@nonfree_list, @removed_list, @undistributable_list) {
@@ -134,9 +136,12 @@
 }
 print "  * Updated HOWTOs:\n" if scalar( keys( %modified ));
 foreach ( sort keys %modified ) {
-    my $nonfree = exists $nonfree_list{$_} ? "(nonfree)" : "";
+    my $nonfree = exists $nonfree_list{$_} ? " (nonfree)" : "";
     push(@nonfree_mentioned, $_) if $nonfree;
-    print "    $_ $nonfree\n";
+    my $license = qx{rgrep --files-with-matches --exclude "*.svn*" "^HOWTO: $_\$" debian/copyrights};
+    chomp $license;
+    $license = basename $license;
+    print "    $_ [$license]$nonfree\n";
 }
 print "  * Added HOWTOs:\n" if scalar( keys( %added ));
 foreach ( sort keys %added ) {
@@ -147,4 +152,4 @@
 }
 print "  * All mentioned HOWTOs are free except for: ".
     join(", ",sort @nonfree_mentioned)."\n";
-print "\n -- \n";
+print "\n -- \n\n";