Imported Debian patch 1.3.12-6

diff --git a/debian/README.build b/debian/README.build
new file mode 100644 (file)
index 0000000..22892dd
--- /dev/null
+++ b/debian/README.build
@@ -0,0 +1,10 @@
+Note that using sudo during the build, such as with 'dpkg-buildpackage -rsudo'
+may fail because wine (which is needed to run mingw32) doesn't like being run
+as root when ~/.wine is owned by a normal user.  The fix for this is to either
+build gzip with another root-gaining tool (fakeroot works fine), or to run the
+entire build as root (ick!).  It may be possible to also solve this with some
+interesting set of wine options, but I'm not motivated to figure that out since
+fakeroot works.
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 15 Apr 2008 08:16:17 -0600
+

diff --git a/debian/changelog b/debian/changelog
index d748e6cbba05dfd0aae68f335574924d1628f85d..61385d836632590763c4745015668898d2d32638 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gzip (1.3.12-6) unstable; urgency=low
+
+  * strip the win32 gzip.exe binary during install, closes: #464455
+  * patch from Reuben Thomas for the zless.1 man page with pointers to 
+    lessfile and lesspipe, which are a better solution than zless in most
+    cases... closes: #46787, #51162
+  * fix FTBFS when using gcc-4.3, closes: #476031
+  * remove the preinst since the --assert-support-predepends check should
+    no longer be necessary
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 15 Apr 2008 14:03:26 -0600
+

 gzip (1.3.12-5) unstable; urgency=low
 
   * patch for zgrep.in from Daniel Kobras, closes: #434429
 gzip (1.3.12-5) unstable; urgency=low
 
   * patch for zgrep.in from Daniel Kobras, closes: #434429

diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644 (file)
index 6230ffa..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dpkg --assert-support-predepends
-
-#DEBHELPER#

diff --git a/debian/rules b/debian/rules
index 44ea806bdfd8b2c2d9bc287643743e770ba69428..dc8534a0ec545291a6c5a1493690e1e928edd0dc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,16 +13,16 @@ endif
 
 buildarch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(buildarch),amd64)
 
 buildarch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(buildarch),amd64)

-CFLAGS="-g -O2 -Wall -DUNALIGNED_OK"
+CFLAGS=-g -O2 -Wall -DUNALIGNED_OK

 else
 else

-CFLAGS="-g -O2 -Wall" 
+CFLAGS=-g -O2 -Wall

 endif
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
        mkdir -p build
 endif
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
        mkdir -p build

-       cd build && CFLAGS=$(CFLAGS) ../configure \
+       cd build && ../configure \

                --prefix=/usr --bindir=/bin \
                --infodir=`pwd`/debian/gzip/usr/share/info \
                --mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
                --prefix=/usr --bindir=/bin \
                --infodir=`pwd`/debian/gzip/usr/share/info \
                --mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)


@@ -70,6 +70,7 @@ install-win32: build-win32
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 

+       i586-mingw32msvc-strip build-win32/gzip.exe

        install -m 0755 build-win32/gzip.exe debian/gzip-win32/usr/share/win32/
 
 binary-indep:  build-win32 install-win32
        install -m 0755 build-win32/gzip.exe debian/gzip-win32/usr/share/win32/
 
 binary-indep:  build-win32 install-win32

diff --git a/zless.1 b/zless.1
index ca02423126157d32b6657a56c29575b9fcce889b..26d0ddd3b00ae65f588a7b05439bf34e18c4ccac 100644 (file)
--- a/zless.1
+++ b/zless.1
@@ -13,20 +13,20 @@ and the environment variable LESSMETACHARS to
 "'<space><tab><newline>;*?"()<>[|&^`#\\$%=~'",
 and then running
 .IR less .
 "'<space><tab><newline>;*?"()<>[|&^`#\\$%=~'",
 and then running
 .IR less .

-However, enough people seem to think that having the
-command
-.I zless
-available is important to be worth providing it.
-
-Note that zless does not work with files piped to it on stdin, it only works
-with files specified as arguments.  If you really want to use less in a pipe,
-then do the uncompress explicitly and pipe to less instead of using zless.
+.I Less
+now provides similar, and more flexible, functionality through the
+.I lessfile
+and
+.I lesspipe
+filters.

 .SH "SEE ALSO"
 .SH "SEE ALSO"

-zmore(1), less(1)
+zmore(1), less(1), lessfile(1), lesspipe(1)

 .SH "BUGS"
 .I Zless
 does not work with compressed data that is piped to it via standard
 input; it requires that input files be specified as arguments.
 .SH "BUGS"
 .I Zless
 does not work with compressed data that is piped to it via standard
 input; it requires that input files be specified as arguments.

+If you really want to use less in a pipe,
+then do the uncompress explicitly and pipe to less instead of using zless.

 .SH "COPYRIGHT NOTICE"
 Copyright \(co 2006 Free Software Foundation, Inc.
 .br
 .SH "COPYRIGHT NOTICE"
 Copyright \(co 2006 Free Software Foundation, Inc.
 .br