Bug#129437: psptools: try this patch first, cancels previous submits

[Don <theme@linuxfreemail.com>]

Package: psptools
Version: 2.2.1-6
Severity: normal


These are just the bug fixes. The previous additions are not
performing as expected. At least this works and does not affect
the upstream author's approach as my previous patches did.

This would be the best choice for a first attempt in my opinion.
This patch supercedes all of my previous patches.

Don
theme@linuxfreemail.com


--- psptools-1.2.2.orig/src/psplpr.pl.in	Wed Jul  3 04:49:28 1996
+++ psptools-1.2.2/src/psplpr.pl.in	Tue Jan 15 15:34:56 2002
@@ -33,6 +33,8 @@
 require 'ppd.pl';
 require 'printer.pl';
 
+$used_prog_lpr = $prog_lpr;     # default value (overridden by --output)
+
 #
 # tell_user(what)
 #
@@ -157,7 +159,7 @@
 	++$dictsz if $pagesetup;
     }
 
-    return unless $dictsz;
+    return unless ($dictsz > 1);
 
     if (!$nodsc) {
 	print "%%BeginResource: procset psplpr\n";
@@ -346,7 +348,7 @@
     }
 
     if (!$doc) {
-	print "psplprdict begin psplprsetup end\n";
+	print "psplprdict begin psplprsetup end\n" if countfeatures('PageSetup');
     }
 
     if ($doc && $dsc) {
@@ -598,7 +625,7 @@
 	    }
 
 	    if (/^%%Page:/) {
-		local($addsc) = 0;
+		local($adddsc) = 0;
 
 		if (!$prolog_output) {
 		    outputfeatures('Prolog', $nodsc, $safer, $nonstd,
@@ -815,10 +845,15 @@
 	$opt_output = $args[1];
 	usage(1) if (!$opt_output);
 	shift @args;
-    } elsif ($args[0] eq "-${lopt_prefix}lpr") {
+    } elsif ($args[0] eq "--${lopt_prefix}lpr") {
 	$used_prog_lpr = $prog_lpr;
-    } elsif ($args[0] eq "-${lopt_prefix}lp") {
+    } elsif ($args[0] eq "--${lopt_prefix}lp") {
 	$used_prog_lpr = $prog_lp;
+    } elsif ($args[0] eq "-${opt_prefix}P") {
+        $printer = $args[1];
+        usage(1) if (($printer = $args[1]) eq '');
+        $used_prog_lpr = $prog_lpr;
+        shift @args;
     } elsif ($args[0] eq "--${lopt_prefix}verbose") {
         $opt_verbose = 1;
     } elsif ($args[0] eq "-${opt_prefix}q"