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

[Frank Küster]

Author: frank
Date: 2006-03-28 09:18:06 +0000 (Tue, 28 Mar 2006)
New Revision: 1114

Modified:
   tetex-base/trunk/debian/tpm2licenses-new.pl
Log:
further adjustments needed for texlive

Modified: tetex-base/trunk/debian/tpm2licenses-new.pl
===================================================================
--- tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-27 17:41:36 UTC (rev 1113)
+++ tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-28 09:18:06 UTC (rev 1114)
@@ -45,7 +45,7 @@
 
 for my $cfgDir (@cfgDirs) {
     if ( -r "$cfgDir/$cfgName" ) {
-	print "Using configuration file $cfgDir/$cfgName\n";
+	print STDERR "Using configuration file $cfgDir/$cfgName\n";
 	$config->file("$cfgDir/$cfgName");
     };
 };
@@ -71,9 +71,13 @@
 
 if ($debian_package) {
     die "Unknown Debian package: $debian_package." unless
-	( $debian_package =~ /^tetex-base$/ || 
-	  $debian_package =~ /^tetex-src$/  ||
-	  $debian_package =~ /^texlive-base$/ );
+	( $debian_package =~ /^tetex-base$/    || 
+	  $debian_package =~ /^tetex-src$/     ||
+	  $debian_package =~ /^texlive-base$/  ||
+	  $debian_package =~ /^texlive-extra$/ ||
+	  $debian_package =~ /^texlive-lang$/  ||
+	  $debian_package =~ /^texlive-doc$/   ||
+	  $debian_package =~ /^texlive-bin$/     );
 };
 
 my $TpmGlobalPath = $Master;
@@ -169,7 +173,7 @@
   if 	( $debian_package =~ /^texlive-/ ) {
     my $cfgfile = "../../" . $debian_package . ".tpm4licenses.cfg";
     my @cfgLines;
-    open CFGFILE, $cfgfile;
+    open CFGFILE, $cfgfile or die "could not open $cfgfile";
     while (<CFGFILE>) {
       # this could go into one line (next if...) if only Emacs would grok it...
       if (m/^#/) {