Author: frank
Date: 2006-04-10 13:16:17 +0000 (Mon, 10 Apr 2006)
New Revision: 1178
Modified:
tetex-base/trunk/debian/tpm2licenses-new.pl
Log:
make tpm2licenses work with Debian's libxml-dom-perl instead of the texlive copy
Modified: tetex-base/trunk/debian/tpm2licenses-new.pl
===================================================================
--- tetex-base/trunk/debian/tpm2licenses-new.pl 2006-04-10 13:15:00 UTC (rev
1177)
+++ tetex-base/trunk/debian/tpm2licenses-new.pl 2006-04-10 13:16:17 UTC (rev
1178)
@@ -84,8 +84,8 @@
$debian_package =~ /^texlive-bin$/ );
};
-my $TpmGlobalPath = $Master;
-my $DataGlobalPath = $Master;
+# my $TpmGlobalPath = $Master;
+# my $DataGlobalPath = $Master;
# texlive
# my $TpmDirGlob = $Master . "./texmf-dist/tpm/*.tpm";
@@ -100,7 +100,7 @@
#
# put Master/Tools/ into the include path to find TeX live perl modules
#
-unshift (@INC, "$Master/Tools");
+# unshift (@INC, "$Master/Tools");
#
# these we can only load now that we have correctly set the path to Master
#
@@ -307,46 +307,58 @@
my @SourceFiles = split(/\n/m,$SourceFiles{"text"});
my @RunFiles = split(/\n/m,$RunFiles{"text"});
my @DocFiles = split(/\n/m,$DocFiles{"text"});
+ foreach (@SourceFiles) {
+ s/^\s//;
+ [EMAIL PROTECTED](.*)[EMAIL PROTECTED]@so;
+ [EMAIL PROTECTED]@[EMAIL PROTECTED];
+ };
+ foreach (@RunFiles) {
+ s/\s//;
+ [EMAIL PROTECTED](.*)[EMAIL PROTECTED]@so;
+ [EMAIL PROTECTED]@[EMAIL PROTECTED];
+ };
+ foreach (@DocFiles) {
+ s/\s//;
+ [EMAIL PROTECTED](.*)[EMAIL PROTECTED]@so;
+ [EMAIL PROTECTED]@[EMAIL PROTECTED];
+ };
+ @DocFiles = grep(!/^$/,@DocFiles);
+ @RunFiles = grep(!/^$/,@RunFiles);
+ @SourceFiles = grep(!/^$/,@SourceFiles);
for ($debian_package) {
my @texmfPath;
if ( /^texlive/ ) {
@texmfPath = ("texmf","texmf-dist","texmf-doc");
- foreach ($RunFiles{"text"}, $DocFiles{"text"}, $SourceFiles{"text"}) {
- my @filelist = split(/\n/m,$_);
- next if (! @filelist);
- foreach (@filelist) {CheckFileExistence($_,[EMAIL PROTECTED])};
- };
-
+ foreach (@RunFiles) {CheckFileExistence($_,[EMAIL PROTECTED])};
+ foreach (@DocFiles) {CheckFileExistence($_,[EMAIL PROTECTED])};
+ foreach (@SourceFiles) {CheckFileExistence($_,[EMAIL PROTECTED])};
MergeDirectories([EMAIL PROTECTED],[EMAIL PROTECTED]);
MergeDirectories([EMAIL PROTECTED],[EMAIL PROTECTED]) if (@DocFiles);
MergeDirectories([EMAIL PROTECTED],[EMAIL PROTECTED]) if (@SourceFiles);
- print "\n";
- print $pkg_header . "\n @RunFiles @DocFiles @SourceFiles";
+ print "\n" . $pkg_header . "\n";
+ print @RunFiles;
+ print @DocFiles;
+ print @SourceFiles;
};
if ( /^tetex-base$/ ) {
@texmfPath = (".");
- foreach ($RunFiles{"text"}, $DocFiles{"text"}) {
- my @filelist = split(/\n/m,$_);
- next if (! @filelist);
- foreach (@filelist) {CheckFileExistence($_,[EMAIL PROTECTED])};
- };
+ foreach (@RunFiles) {CheckFileExistence($_,[EMAIL PROTECTED])};
+ foreach (@DocFiles) {CheckFileExistence($_,[EMAIL PROTECTED])};
MergeDirectories([EMAIL PROTECTED],[EMAIL PROTECTED]);
MergeDirectories([EMAIL PROTECTED],[EMAIL PROTECTED]) if (@DocFiles);
- print "\n";
- print $pkg_header . "\n @RunFiles @DocFiles";
+ print "\n" . $pkg_header . "\n";
+ print @RunFiles;
+ print @DocFiles;
};
if ( /^tetex-src$/ ) {
- @texmfPath = (".");
- foreach ($SourceFiles{"text"}) {
- my @filelist = split(/\n/m,$_);
- foreach (@filelist) {CheckFileExistence($_,[EMAIL PROTECTED])};
- };
-
+ foreach (@SourceFiles) {CheckFileExistence($_,[EMAIL PROTECTED])};
MergeDirectories([EMAIL PROTECTED],[EMAIL PROTECTED]);
- print "\n";
- print $pkg_header . "\n @SourceFiles" unless (! @SourceFiles);
+ unless (! @SourceFiles) {
+ print "\n" . $pkg_header . "\n";
+ print @SourceFiles;
+ }
};
};
}
@@ -362,7 +374,6 @@
sub MergeDirectories {
my ($filelist,@texmfPath) = ($_[0],@{$_[1]}); # $filelist is actually a
pointer
-
# create a list of dirnames, and remove duplicates
my @dirnames = map {dirname($_) } @{$filelist};
my %UniqueHash = map { $_ , 1 } @dirnames;
@@ -403,7 +414,6 @@
# now the complete directories occur multiple times, remove duplicates
again
%UniqueHash = map { ("$_\n" , 1) } @{$filelist} ;
@{$filelist} = keys %UniqueHash;
-
}
}
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
