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

[Frank Küster]

Author: frank
Date: 2006-07-07 17:59:48 +0000 (Fri, 07 Jul 2006)
New Revision: 1482

Modified:
   tetex-base/trunk/debian/searchbase35
Log:
some changes after discussion with Ralf

Modified: tetex-base/trunk/debian/searchbase35
===================================================================
--- tetex-base/trunk/debian/searchbase35	2006-07-06 18:22:41 UTC (rev 1481)
+++ tetex-base/trunk/debian/searchbase35	2006-07-07 17:59:48 UTC (rev 1482)
@@ -29,7 +29,7 @@
 my %psnfssRequired = (
   Title => "%% Required PSNFSS fonts",
   Pattern => "urw/base35|lw35nfs|freenfss|charter/bch",
-  ExclusionPattern => "1999",
+  ExclusionPattern => "1999|psnfss-source",
   Filename =>"psnfss-required.txt",
   ListName => "required",
   Lengths => "15,15,40,30",
@@ -187,6 +187,7 @@
 % for processing (La)TeX files."
 );
 
+# augsburg is unused, this is also in an archive
 my %augsburg = (
   Title => "%% metrics and virtual font for the obsolete dvi and dvilw drivers",
   Pattern => "dvi-augsburg",
@@ -225,7 +226,7 @@
 
 my @categories = (\%psnfssRequired, \%URWdirectaccess, \%PCLnfss,
 \%URWrenamed, \%IBM, \%Adobephvl, \%lw35obs, \%psnfssxLY1,
-\%cspsfonts, \%psnfssSource, \%augsburg, \%pslatex);
+\%cspsfonts, \%psnfssSource, \%pslatex);
 
 my $tpmDir = "texmf-dist/tpm/";
 
@@ -296,9 +297,9 @@
   my $file = basename($_[0]);
  SWITCH: {
    if ($file =~ /^lw35nfss.zip$/ ) { return "license: LPPL"; last SWITCH };
-   if ($file =~ /^1999-lw35nfss.zip$/ ) { return "license: LPPL"; last SWITCH };
+   if ($file =~ /^1999-lw35nfss.zip$/ ) { return "license: unclear"; last SWITCH };
    if ($file =~ /^freenfss.zip$/ ) { return "license: LPPL"; last SWITCH };
-   if ($file =~ /^cspsfonts.tar.gz$/ ) { return "license: CSTEX (unclear)"; last SWITCH };
+   if ($file =~ /^cspsfonts.tar.gz$/ ) { return "license: GPL"; last SWITCH };
    if ($file =~ /^ly1-min.zip$/ ) { return "license: unknown (Carlisle)"; last SWITCH };
 
    return "unknown";
@@ -315,6 +316,7 @@
    };
    if ($file =~ m(pslatex) ) { return "license: LPPL"; last SWITCH };
    if ($file =~ m(fonts/charter) ) { return "license: Bitstream, free"; last SWITCH };
+   if ($file =~ m(pclnfss) ) { return "license: GPL"; last SWITCH };
    return (30," \t license: unknown");
   };
 };
@@ -365,6 +367,7 @@
   my @Files = grep {!/^\s*$/} @RunFiles ;
 
   foreach my $file (@Files) {
+    print ALLFILESLIST "$file\n";
     my $basefile = basename($file);
     my $locline;
   FINDLOC: {
@@ -374,6 +377,11 @@
       $locline = $loc; 
       last FINDLOC
     }
+    # now look in some other archives
+    if ($loc = grepOtherArchive($basefile)) {
+      $locline = $loc;
+      last FINDLOC
+    }
     # now look in the CTAN filelist
     if ($CTANbyname{$basefile}) { 
       my $license;
@@ -383,11 +391,6 @@
 	$basefile ."@". " " ."@". $CTANbyname{$basefile} ."@". "license: unknown";
       last FINDLOC
     }
-    # now look in some other archives
-    if ($loc = grepOtherArchive($basefile)) {
-      $locline = $loc;
-      last FINDLOC
-    }
     # still no hit
     $locline = $basefile ."@". $noCTAN ."@". $file ."@". "license: unknown";
     }
@@ -452,6 +455,8 @@
 };
 
 
+my $allfileslist = "psnfss-allrawfiles.txt";
+open (ALLFILESLIST,'>',$allfileslist) or die "can't open $allfileslist";
 # main sorting loop
 foreach my $font (@fontlist) {
   CreateAllFilesList ($font);
@@ -459,6 +464,7 @@
   # now sort files...
  SortFileLists($font);
 };
+close ALLFILESLIST;
 
 # main output file
 my $merge_outfile = "psnfss-allcurrent.txt";