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

[Frank Küster]

Author: frank
Date: 2006-03-22 17:35:59 +0000 (Wed, 22 Mar 2006)
New Revision: 1091

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/common.functions.in
   tetex-base/trunk/debian/tpm2licenses-new.pl
Log:
changelog entries for the last commits, and propagating changes from tex-common

Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-03-22 17:35:27 UTC (rev 1090)
+++ tetex-base/trunk/debian/changelog	2006-03-22 17:35:59 UTC (rev 1091)
@@ -11,8 +11,12 @@
     tetex-src [frank]
   * Backports: Changed infrastructure to generate headers for uploads to
     backports.org. [frank]
+  * Correct a test in our postinst, so that the format file in fact
+    regenerated when tetex-base is upgraded in the presence of tetex-bin. [frank]
+  * Remove test for /usr/bin/texlinks from the postinst, it is never
+    used. [frank]
 
- -- Frank Küster <frank at debian.org>  Fri, 17 Mar 2006 12:10:32 +0100
+ -- Frank Küster <frank at debian.org>  Wed, 22 Mar 2006 17:10:20 +0100
 
 tetex-base (3.0-15) unstable; urgency=high
 

Modified: tetex-base/trunk/debian/common.functions.in
===================================================================
--- tetex-base/trunk/debian/common.functions.in	2006-03-22 17:35:27 UTC (rev 1090)
+++ tetex-base/trunk/debian/common.functions.in	2006-03-22 17:35:59 UTC (rev 1091)
@@ -570,6 +570,8 @@
  /etc/texmf/dvips/omega.cfg 20f3291d20f52a0af681cea63d491f22
  /etc/texmf/dvips/config.omega 20f3291d20f52a0af681cea63d491f22
  /etc/texmf/context/texexec.rme aca8d2729ceb83bc24852c0876cf884b
+
+ /etc/texmf/language.d/00tetex.cnf e057f645b860c3b4ac92a9b5a127c43e
 "
 
 get_sarge_md5sum_from_list(){

Modified: tetex-base/trunk/debian/tpm2licenses-new.pl
===================================================================
--- tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-22 17:35:27 UTC (rev 1090)
+++ tetex-base/trunk/debian/tpm2licenses-new.pl	2006-03-22 17:35:59 UTC (rev 1091)
@@ -27,7 +27,7 @@
 use File::Copy;
 use File::Path;
 use File::Temp qw/ tempfile tempdir /;
-use ConfigFile;
+use Config::General;
 #use XML::DOM;
 use Cwd;
 #use FileUtils qw(canon_dir cleandir make_link newpath member
@@ -37,38 +37,61 @@
 
 
 # $opt_debug=0; # unused
-my $opt_master=".";
-my $opt_catalogue="/src/TeX/texcatalogue/";
-my $opt_what="license";
-my $Master;
-my $what;
+my $Master=".";
+my $Catalogue="/src/TeX/texcatalogue/";
+my $what="license";
 my $debian_package = "";
 my $tpmdir = "./debian/tpm";
 my $nocatalogue = '';
 
 # parse configurationfile, if present
-# my $cfg = 
+my @cfgDirs = (".","./debian","..","~");
+my $cfgName = "tpm2license.cfg";
+my %Option;
 
+for my $cfgDir (@cfgDirs) {
+    if ( -r "$cfgDir/$cfgName" ) {
+	print "Using configuration file $cfgDir/$cfgName\n";
+	my $conf = new Config::General("$cfgDir/$cfgName");
+	my %LocalCfgHash = $conf->getall;
+	foreach (keys %LocalCfgHash) {
+	    $Option{$_} = $LocalCfgHash{$_};
+	};
+    };
+};
+
+my @CmdLineOptionsList = ("Master", "Catalogue", "what", "debian_package", "tpmdir", "nocatalogue");
+
+foreach my $CurrentOption (@CmdLineOptionsList) {
+    if ($Option{$CurrentOption}){print "$Option{$CurrentOption}\n"};
+}
+
+# print Dumper %Option;
+
+exit 0; 
+
 GetOptions ("debug!", 	# debug mode
-	"master=s" => \$opt_master,	# location of Master
-	"catalogue=s" => \$opt_catalogue,	# location of the catalogue
-	"what=s" => \$opt_what,      # print licenses or files in a tpm?
+	"master=s" => \$Master,	# location of Master
+	"catalogue=s" => \$Catalogue,	# location of the catalogue
+	"what=s" => \$what,      # print licenses or files in a tpm?
 	"debian=s" => \$debian_package, # tetex-base: print RunFiles, DocFiles; -src: SourceFiles, texlive: To be implemented.
         "tpmdir=s" => \$tpmdir, # directory with tpm's (for teTeX)
 	"nocatalogue" => \$nocatalogue # list files even if no catalogue entry is found
 	);
- 
-# print "Catalogue: $nocatalogue\n";
 
-if (!($opt_master =~ m,/.*$,,)) {
-    $Master = `pwd`;
-    chomp($Master);
-    $Master .= "/$opt_master";
-} else {
-    $Master = $opt_master;
-}
-$what = $opt_what;
 
+
+
+
+# if (!($opt_master =~ m,/.*$,,)) {
+#     $Master = `pwd`;
+#     chomp($Master);
+#     $Master .= "/$opt_master";
+# } else {
+#     $Master = $opt_master;
+# }
+# $what = $opt_what;
+
 if ($debian_package) {
     die "Unknown Debian package: $debian_package." unless
 	( $debian_package =~ /^tetex-base$/ || 
@@ -92,7 +115,7 @@
 #
 # these we can only load now that we have correctly set the path to Master
 #
-require Strict;
+# require Strict;
 require XML::DOM;
 require FileUtils;
 import FileUtils qw(canon_dir cleandir make_link newpath member
@@ -166,7 +189,7 @@
       }
       $licline .= "$bn: ";
       my $fletter = substr($pkgcat, 0, 1);
-      my $catname = "${opt_catalogue}/entries/$fletter/${pkgcat}.xml";
+      my $catname = "${Catalogue}/entries/$fletter/${pkgcat}.xml";
       if (! -r $catname) {
 	  $catname = "$tpmdir/${pkgcat}.xml";
 	  if (! -r $catname) {