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

[Frank Küster]

Author: frank
Date: 2006-03-06 01:10:29 +0000 (Mon, 06 Mar 2006)
New Revision: 1011

Modified:
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/tpm2licenses-new.pl
Log:
tpm2licenses-new.pl now works: it creates Copyright.Files, ready with licenses by the package name

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-03-05 20:00:18 UTC (rev 1010)
+++ tetex-base/trunk/debian/rules	2006-03-06 01:10:29 UTC (rev 1011)
@@ -220,7 +220,7 @@
 
 debian/sarge-stamp: 
 	cp debian/changelog debian/sarge/changelog.sid
-	sed -e s/3.0-14.1/3.0-13sarge14.1/ debian/sarge/changelog.sid \
+	sed -e s/3.0-15/3.0-14sarge15/ debian/sarge/changelog.sid \
 	  > debian/changelog && rm debian/sid-stamp
 	# need to remake rules
 	touch debian/rules.in

Modified: tetex-base/trunk/debian/tpm2licenses-new.pl
===================================================================
--- tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-05 20:00:18 UTC (rev 1010)
+++ tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-06 01:10:29 UTC (rev 1011)
@@ -171,7 +171,7 @@
 	  } else {
 	    $licline .= "$ltype (unverified)";
 	    # we know the license, it makes sense to output the files
-	    $what eq "files" && &printFiles($pkgcat,$LocalTPM)
+	    $what eq "files" && &printFiles($LocalTPM,$licline)
 	  }
 	  $what eq "license" && print "$licline\n";
 	  next;
@@ -179,18 +179,26 @@
 	$licline .= "$ltype (verification data:$version:$lversion:$lchecked:$luser)";
 	$what eq "license" && print "$licline\n";
 	# we know the license, it makes sense to output the files
-	$what eq "files" && &printFiles($pkgcat,$catname)
+	$what eq "files" && &printFiles($LocalTPM,$licline)
       }
    }
 
 sub printFiles {
-    my ($pkgcat, $LocalTPM)= @_;
-    my $pkg_header = "% $pkgcat";
+    my ($LocalTPM,$licline)= @_;
+    my $pkg_header = "% " . $licline;
     my $dom_parser = new XML::DOM::Parser;
     my $doc = $dom_parser->parsefile($LocalTPM);
     my %SourceFiles = &Tpm::getListField($doc, "SourceFiles");
-    print $pkg_header . "\n";
-    print $SourceFiles{text} . "\n";
+    my %RunFiles = &Tpm::getListField($doc, "RunFiles");
+    my %DocFiles = &Tpm::getListField($doc, "DocFiles");
+
+    # this is already done in Tpm.pm, why isn't that sufficient?
+    foreach ($RunFiles{"text"}, $DocFiles{"text"}, $SourceFiles{"text"}) { $_ =~ s/^\n*// };
+
+    # we don't want the tpm file which isn't installed
+    $RunFiles{"text"} =~ s/\n.*\.tpm$//m;
+
+    print $pkg_header . "\n" . $RunFiles{"text"} . $DocFiles{"text"} . $SourceFiles{"text"} . "\n";
 }
 
 #   foreach $LocalTPM (<./texmf-doc/tpm/*.tpm>) {