Bug#421385: $HOME/.html2psrc not read

[Trent Buck]

Package: html2ps
Version: 1.0b5-4
Severity: important
Tags: patch

The #410011 fix applied as 1.0b5-4 1) did not fix #410011; and 2)
introduced further errors.  The most important of these is that users'
config files are not read.  The attached patch (in ADDITION to the
1.0b5-4 patch, NOT instead of the 1.0b5-4 patch) fixes both (1) and
(2).

diff -ur html2ps-1.0b5/debian/config/html2psrc 
html2ps-1.0b5/debian/config/html2psrc
--- html2ps-1.0b5/debian/config/html2psrc       2007-04-28 23:54:57.000000000 
+1000
+++ html2ps-1.0b5/debian/config/html2psrc       2007-04-29 00:19:23.784198087 
+1000
@@ -10,9 +10,6 @@
     libwww-perl: 1;
     path: "/usr/X11R6/bin:/usr/bin";
   }
-  paper {
-    type: letter;
-  }
   hyphenation {
     en {
       file: "/usr/share/texmf/tex/generic/hyphen/ushyph1.tex";
diff -ur html2ps-1.0b5/html2ps html2ps-1.0b5/html2ps
--- html2ps-1.0b5/html2ps       2007-04-28 23:54:57.000000000 +1000
+++ html2ps-1.0b5/html2ps       2007-04-29 00:18:17.017582576 +1000
@@ -88,7 +88,7 @@
     middle: 2cm;
   }
   xref {
-    text: "[p $N]";
+    text: "[p \$N]";
     passes: 1;
   }
   quote {
@@ -135,8 +135,8 @@
   }
   titlepage {
     content: "<DIV align=center>
-      <H1><BIG>$T</BIG></H1>
-      <H2>$[author]</H2></DIV>";
+      <H1><BIG>\$T</BIG></H1>
+      <H2>\$[author]</H2></DIV>";
     margin-top: 4cm;
   }
   font {
@@ -268,7 +268,7 @@
     fuchsia: FF00FF;
     aqua: 00FFFF;
   }
-  html2psrc: "$HOME/.html2psrc";
+  html2psrc: "\$HOME/.html2psrc";
   imgalt: "[IMAGE]";
   datefmt: "%e %b %Y  %R";
   locale: "";