Import Debian changes 1.9-2.2

[debian/gzip] / debian / rules

diff --git a/debian/rules b/debian/rules
index 6936ecb71696c88546e352000fd5cb34ef8b7c45..26fb1a62006032ebcc2a895ba13810670e04e077 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ configure-stamp: reconf-stamp
        mkdir -p builddir
        cd builddir && env \
            $(foreach i,CC CFLAGS CPPFLAGS LDFLAGS,$(call shellexport,$i)) \
-           CONFIG_SHELL=/bin/sh ../configure ${CONFIGURE_ARGS}
+           CONFIG_SHELL=/bin/sh GREP=grep ../configure ${CONFIGURE_ARGS}
        :>$@
 
 configure-indep: configure-indep-stamp
@@ -119,7 +119,7 @@ binary: binary-arch binary-indep
 binary-indep: build-indep-stamp
        dh_testdir
        dh_testroot
-       if test -x "$$(which dh_prep)"; then dh_prep; else dh_clean -k; fi
+       dh_prep
        dh_installdirs
        i686-w64-mingw32-strip builddir-indep/gzip.exe
        install -m 0755 builddir-indep/gzip.exe \
@@ -137,32 +137,32 @@ binary-indep: build-indep-stamp
 binary-arch: build-stamp
        dh_testdir
        dh_testroot
-       if test -x "$$(which dh_prep)"; then dh_prep; else dh_clean -k; fi
+       dh_prep
        dh_installdirs
        ${MAKE} -C builddir install \
            prefix=${_topdir}/debian/gzip/usr \
            bindir=${_topdir}/debian/gzip/bin
-       dh_testdir -s
-       dh_testroot -s
-       dh_installdocs -s README* TODO
+       dh_testdir -a
+       dh_testroot -a
+       dh_installdocs -a README* TODO
        dh_installman *.1
-       dh_installinfo -s doc/gzip.info
-       dh_installchangelogs -s ChangeLog
-       dh_link -s
-       dh_lintian -s
-       dh_strip -s
-       dh_compress -s
+       dh_installinfo -a doc/gzip.info
+       dh_installchangelogs -a ChangeLog
+       dh_link -a
+       dh_lintian -a
+       dh_strip -a
+       dh_compress -a
        ln -s gunzip.1.gz debian/gzip/usr/share/man/man1/uncompress.1.gz
        ln -s zgrep.1.gz debian/gzip/usr/share/man/man1/zegrep.1.gz
        ln -s zgrep.1.gz debian/gzip/usr/share/man/man1/zfgrep.1.gz
        rm -f ${_topdir}/debian/gzip/usr/share/info/dir.gz
-       dh_fixperms -s
-       dh_makeshlibs -s
-       dh_installdeb -s
-       dh_shlibdeps -s
-       dh_gencontrol -s
-       dh_md5sums -s
-       dh_builddeb -s
+       dh_fixperms -a
+       dh_makeshlibs -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
 
 .PHONY: binary binary-arch binary-indep build build-arch build-indep clean
 .PHONY: configure configure-indep