Imported Debian patch 1.3.12-3

diff --git a/debian/changelog b/debian/changelog
index 174b9afde28276563403392819c3818cda357a3f..660c64457610dc9034f5789776fb4e9b79d02249 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gzip (1.3.12-3) unstable; urgency=low
+
+  * fix bindir so gunzip, et al, work again, closes: #429462
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 22 Jun 2007 01:08:59 +0100
+

 gzip (1.3.12-2) unstable; urgency=low
 
   * fix typo in gzip fprintf, closes: #426965
 gzip (1.3.12-2) unstable; urgency=low
 
   * fix typo in gzip fprintf, closes: #426965

diff --git a/debian/rules b/debian/rules
index 09d3d007335193ee0ad2702af6cea0742ff59804..931925b2451278f3f55bac8632c5fd6376f8635f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
        CFLAGS=$(CFLAGS) ./configure \
 configure-stamp:
        dh_testdir
        CFLAGS=$(CFLAGS) ./configure \

-               --prefix=/usr \
+               --prefix=/usr --bindir=/bin \

                --infodir=`pwd`/debian/gzip/usr/share/info \
                --mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
        touch configure-stamp
                --infodir=`pwd`/debian/gzip/usr/share/info \
                --mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
        touch configure-stamp


@@ -41,9 +41,7 @@ install: build
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 

-       make install prefix=debian/gzip/usr bindir=debian/gzip/bin \
-                scriptdir=debian/gzip/usr/bin
-#      ln debian/gzip/bin/gzip debian/gzip/bin/uncompress
+       make install prefix=debian/gzip/usr bindir=debian/gzip/bin 

        install -o root -g root -m 0644 debian/gzip.lintian \
                debian/gzip/usr/share/lintian/overrides/gzip
 
        install -o root -g root -m 0644 debian/gzip.lintian \
                debian/gzip/usr/share/lintian/overrides/gzip