update standards version, dependencies, and rules targets to track policy

diff --git a/debian/control b/debian/control
index 53521ba1ce2b82c26cfee9e756fd30f3c221d719..e96e558fb94cd3529b0ad0852eb3792d965ea4ee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,15 @@ Maintainer: Bdale Garbee <bdale@gag.com>
 Uploaders: Carl Worth <cworth@cworth.org>
 Build-Depends: debhelper (>= 5), texinfo, autoconf, automake, autotools-dev
 Build-Depends-Indep: mingw-w64
-Standards-Version: 3.8.0
+Standards-Version: 3.9.2
 Vcs-Git: git://git.gag.com/debian/gzip
 Vcs-Browser: http://git.gag.com/?p=debian/gzip
 
 Package: gzip
 Architecture: any
-Pre-Depends: ${shlibs:Depends}
 Essential: yes
+Pre-Depends: ${shlibs:Depends}
+Depends: dpkg (>= 1.15.4) | install-info
 Suggests: less
 Description: GNU compression utilities
  This package provides the standard GNU file compression utilities, which 
@@ -24,6 +25,6 @@ Package: gzip-win32
 Architecture: all
 Priority: extra
 Suggests: wine
-Description: The GNU compression utility (win32 build)
+Description: GNU compression utility (win32 build)
  This is a win32 version of gzip, meant to be used by the win32-loader
  component of Debian-Installer.

diff --git a/debian/rules b/debian/rules
index 38c7bf02b676dc142d4b3a66627968b3795005cd..a1fe3c5ded446cd08a8d66c227ccf33688478fd8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,30 +33,32 @@ configure-stamp: reconf-stamp
                --mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
        touch configure-stamp
 
-configure-win32: configure-win32-stamp
-configure-win32-stamp: reconf-stamp
+configure-indep: configure-indep-stamp
+configure-indep-stamp: reconf-stamp
        dh_testdir
-       mkdir -p build-win32
-       cd build-win32 && ../configure --host=i686-w64-mingw32
-       touch configure-win32-stamp
+       mkdir -p build-indep
+       cd build-indep && ../configure --host=i686-w64-mingw32
+       touch configure-indep-stamp
 
-build: build-stamp 
+build: build-arch build-indep
+
+build-arch: build-stamp 
 build-stamp: configure-stamp
        dh_testdir
        $(MAKE) -C build
        touch build-stamp
 
-build-win32: build-win32-stamp
-build-win32-stamp: configure-win32-stamp
+build-indep: build-indep-stamp
+build-indep-stamp: configure-indep-stamp
        dh_testdir
-       $(MAKE) -C build-win32
-       touch build-win32-stamp
+       $(MAKE) -C build-indep
+       touch build-indep-stamp
 
 clean:
        dh_testdir
        dh_testroot
-       -rm -f build-stamp build-win32-stamp configure-stamp configure-win32-stamp reconf-stamp
-       -rm -rf build build-win32
+       -rm -f build-stamp build-indep-stamp configure-stamp configure-indep-stamp reconf-stamp
+       -rm -rf build build-indep
        dh_clean
 
 install: build
@@ -66,15 +68,15 @@ install: build
        dh_installdirs
        $(MAKE) -C build install prefix=`pwd`/debian/gzip/usr bindir=`pwd`/debian/gzip/bin 
 
-install-win32: build-win32
+install-indep: build-indep
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
-       i686-w64-mingw32-strip build-win32/gzip.exe
-       install -m 0755 build-win32/gzip.exe debian/gzip-win32/usr/share/win32/
+       i686-w64-mingw32-strip build-indep/gzip.exe
+       install -m 0755 build-indep/gzip.exe debian/gzip-indep/usr/share/indep/
 
-binary-indep:  build-win32 install-win32
+binary-indep:  build-indep install-indep
        dh_testdir -i
        dh_testroot -i
        dh_installdocs -i README* TODO
@@ -112,5 +114,5 @@ binary-arch:        build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
-.PHONY: build-win32 install-win32 configure-win32
+.PHONY: build-indep install-indep configure-indep