[subversion-commit] SVN tetex-base commit + diffs: r1049 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-03-14 18:35:46 +0000 (Tue, 14 Mar 2006)
New Revision: 1049

Modified:
   tetex-base/trunk/debian/tpm2licenses-new.pl
Log:
- also output the copyright file of each package
- don't replace source if it's in the middle of the path

Modified: tetex-base/trunk/debian/tpm2licenses-new.pl
===================================================================
--- tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-14 18:35:03 UTC (rev 1048)
+++ tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-14 18:35:46 UTC (rev 1049)
@@ -181,7 +181,7 @@
       }
       unless ($nocatalogue) { #don't try to parse the xml file if we don't have a catalogue
 	  my $cat = $parser->parsefile($catname);
-	  my ($version, $ltype, $lversion, $lchecked, $luser);
+	  my ($version, $ltype, $lversion, $lchecked, $luser, $lfile);
 	  $node = $cat->getElementsByTagName("version")->item(0);
 	  if ($node) {
 	      $version = $node->getAttribute("number");
@@ -193,6 +193,7 @@
 	      $lversion = $node->getAttribute("version");
 	      $lchecked = $node->getAttribute("checked");
 	      $luser = $node->getAttribute("username");
+	      $lfile = $node->getAttribute("file");
 	  }
 	  if ("$lversion$lchecked$luser" eq "") {
 	      if ("$ltype" eq "") {
@@ -203,13 +204,13 @@
 		  $printfiles = '1';
 	      }
 	  } else {
-	      $licline .= "$ltype (verification data:$version:$lversion:$lchecked:$luser)";
+	      $licline .= "$ltype (verification data:$version:$lversion:$lchecked:$luser:$lfile)";
 	      $printfiles = '1';
 	  }
       }
       $what eq "license" && print "$licline\n";
       # we know the license, it makes sense to output the files
-      $what eq "files" && ($printfiles || $nocatalogue) && printFiles($LocalTPM,$licline)
+      $what eq "files" && ($printfiles || $nocatalogue) && printFiles($LocalTPM,$licline);
     }
 
 
@@ -265,7 +266,7 @@
 
 sub CheckFileExistence {
     my $file = $_[0];
-    $file =~ s at source@${sourceDir}source@;
+    $file =~ s@^source@${sourceDir}source@;
     print STDERR "$file: Does not exist!\n" if ! -f $file;
 }