tags 473696 + patch
thanks

Two alternate patches attached - the first fixes the bug by introducing a
patch system (quilt), the second fixes the problem directly.


Regards,

-- 
Chris Lamb, UK                                       [EMAIL PROTECTED]
                                                            GPG: 0x634F9A20
diff -urNad txt2man-1.5.1.orig/debian/control txt2man-1.5.1/debian/control
--- txt2man-1.5.1.orig/debian/control   2008-04-08 09:21:13.000000000 +0100
+++ txt2man-1.5.1/debian/control        2008-04-08 09:28:51.000000000 +0100
@@ -2,7 +2,7 @@
 Section: text
 Priority: optional
 Maintainer: Fredrik Steen <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), gawk
+Build-Depends: debhelper (>> 4.0.0), gawk, quilt
 Standards-Version: 3.7.2.0
 
 Package: txt2man
diff -urNad txt2man-1.5.1.orig/debian/patches/01-bashisms.diff 
txt2man-1.5.1/debian/patches/01-bashisms.diff
--- txt2man-1.5.1.orig/debian/patches/01-bashisms.diff  1970-01-01 
01:00:00.000000000 +0100
+++ txt2man-1.5.1/debian/patches/01-bashisms.diff       2008-04-08 
09:27:39.000000000 +0100
@@ -0,0 +1,28 @@
+
+ * Fix some bashisms.
+
+ -- Chris Lamb <[EMAIL PROTECTED]>  Tue, 08 Apr 2008 09:27:35 +0100
+
+diff -urNad txt2man-1.5.1.orig/bookman txt2man-1.5.1/bookman
+--- txt2man-1.5.1.orig/bookman 2008-04-08 09:21:13.000000000 +0100
++++ txt2man-1.5.1/bookman      2008-04-08 09:24:41.000000000 +0100
+@@ -61,16 +61,16 @@
+ done
+ shift $(($OPTIND - 1))
+ 
+-[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
++[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done)
+ 
+-[[ $outfile ]] && post="$post >$outfile"
++[ $outfile ] && post="$post >$outfile"
+ 
+ {
+       # Compute table of content from postscript output.
+       # Generate output in gtroff intermediate format, so
+       # it can be merged with content.
+       {
+-              [[ -f $cover ]] && cat $cover || {
++              [ -f $cover ] && cat $cover || {
+                       printf ".DA \"\"\n.TL\n%s\n" "$title"
+                       printf ".AU\n%s\n.AB no\n.AE\n" "$author"
+               }
diff -urNad txt2man-1.5.1.orig/debian/patches/series 
txt2man-1.5.1/debian/patches/series
--- txt2man-1.5.1.orig/debian/patches/series    1970-01-01 01:00:00.000000000 
+0100
+++ txt2man-1.5.1/debian/patches/series 2008-04-08 09:27:22.000000000 +0100
@@ -0,0 +1 @@
+01-bashisms.diff
diff -urNad txt2man-1.5.1.orig/debian/rules txt2man-1.5.1/debian/rules
--- txt2man-1.5.1.orig/debian/rules     2008-04-08 09:21:13.000000000 +0100
+++ txt2man-1.5.1/debian/rules  2008-04-08 09:29:08.000000000 +0100
@@ -2,6 +2,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
@@ -16,7 +18,7 @@
        INSTALL_PROGRAM += -s
 endif
 
-configure: configure-stamp
+configure: patch configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
@@ -31,7 +33,7 @@
        # Add here commands to compile the package.
        touch build-stamp
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
diff -urNad txt2man-1.5.1.orig/bookman txt2man-1.5.1/bookman
--- txt2man-1.5.1.orig/bookman  2008-04-08 09:21:13.000000000 +0100
+++ txt2man-1.5.1/bookman       2008-04-08 09:24:41.000000000 +0100
@@ -61,16 +61,16 @@
 done
 shift $(($OPTIND - 1))
 
-[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
+[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done)
 
-[[ $outfile ]] && post="$post >$outfile"
+[ $outfile ] && post="$post >$outfile"
 
 {
        # Compute table of content from postscript output.
        # Generate output in gtroff intermediate format, so
        # it can be merged with content.
        {
-               [[ -f $cover ]] && cat $cover || {
+               [ -f $cover ] && cat $cover || {
                        printf ".DA \"\"\n.TL\n%s\n" "$title"
                        printf ".AU\n%s\n.AB no\n.AE\n" "$author"
                }

Attachment: signature.asc
Description: PGP signature

Reply via email to