[subversion-commit] SVN tetex commit + diffs: r236 - dh-installtexfonts/trunk

[Norbert Preining]

Author: preining-guest
Date: 2005-10-15 22:48:55 +0000 (Sat, 15 Oct 2005)
New Revision: 236

Modified:
   dh-installtexfonts/trunk/dh_installtexfonts
Log:
priority is working


Modified: dh-installtexfonts/trunk/dh_installtexfonts
===================================================================
--- dh-installtexfonts/trunk/dh_installtexfonts	2005-10-15 22:27:29 UTC (rev 235)
+++ dh-installtexfonts/trunk/dh_installtexfonts	2005-10-15 22:48:55 UTC (rev 236)
@@ -11,7 +11,7 @@
 
 =head1 SYNOPSIS
 
-B<dh_installtexfonts> [S<I<debhelper options>>] [B<-o>I<order>] [S<I<maptype mapfile ...>>]
+B<dh_installtexfonts> [S<I<debhelper options>>] [B<--priority=>I<n>] [S<I<maptype mapfile ...>>]
 
 =head1 DESCRIPTION
 
@@ -40,10 +40,10 @@
 
 =over 4
 
-=item B<-o>I<order>, B<--order=>I<order>
+=item B<--priority=>I<n>
 
-Instead of using the default ordering at 10 for the updmap-config file,
-use the order specified after the -o parameter.
+Instead of using the default priority of 10 for the updmap-config file,
+use the priority specified by the --priority parameter.
 
 =head1 NOTES
 
@@ -57,11 +57,11 @@
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $file=pkgfile($package,"maps");
-	my $order=10;
+	my $priority=10;
 	my @maps;
 
-	if (defined($dh{O_PARAMS}) && $dh{O_PARAMS} ne '') {
-		$order=$dh{O_PARAMS};
+	if (defined($dh{PRIORITY}) && $dh{PRIORITY} ne '') {
+		$priority=$dh{PRIORITY};
 	}
 	if ($file) {
 		open(FOO, "<$file") || error("$file cannot be opened.");
@@ -73,10 +73,11 @@
 		if (int($#ARGV/2) eq $#ARGV/2) {
 			error("parameters must come in maptype mapfile pairs.");
 		}
-		while (@ARGV) {
-			my $maptype = pop @ARGV;
-			my $mapfile = pop @ARGV;
-			push @maps, "$maptype mapfile";
+		my @foo = reverse(@ARGV);
+		while (@foo) {
+			my $maptype = pop @foo;
+			my $mapfile = pop @foo;
+			push @maps, "$maptype $mapfile";
 		}
 	}
 
@@ -84,10 +85,10 @@
         if ( ! -d "$tmp/etc/texmf/updmap.d/") {
             doit("install","-d","$tmp/etc/texmf/updmap.d/");
         }
-	open(CFGFILE, ">$tmp/etc/texmf/updmap.d/$order$package.cfg") || 
-		error("Cannot open $tmp/etc/texmf/updmap.d/$order$package.cfg for writing!");
+	open(CFGFILE, ">$tmp/etc/texmf/updmap.d/$priority$package.cfg") || 
+		error("Cannot open $tmp/etc/texmf/updmap.d/$priority$package.cfg for writing!");
 	print CFGFILE <<EOF;
-# $order$package.cfg
+# $priority$package.cfg
 # You can change/add entries to this file and changes will be preserved
 # over upgrades, even if you have removed the main package prior
 # (not if you purged it). YOu should leave the following pseudo comment
@@ -96,7 +97,7 @@
 #
 EOF
 	foreach (@maps) {
-		print CFGFILE "Map $_\n";
+		print CFGFILE "$_\n";
 	}
 	close(CFGFILE);
         if ( ! -d "$tmp/var/lib/tex-common/fontmap-cfg/") {
@@ -104,7 +105,7 @@
         }
 	open(LISTFILE, ">$tmp/var/lib/tex-common/fontmap-cfg/$package.list")||
 		error("Cannot open $tmp/var/lib/tex-common/fmtutil-cnf/$package.list for writing!");
-	print LISTFILE "$order$package";
+	print LISTFILE "$priority$package\n";
 	close(LISTFILE);
 
 	autoscript($package, "postinst", "postinst-texfonts", "");