use dh_lintian to deliver overrides

diff --git a/debian/changelog b/debian/changelog
index b997ac295225adff73411edd06a73ded50a41925..4a5982f7fa03deddfb48a4efb323573e3acb2647 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gzip (1.3.12-9) UNRELEASED; urgency=low
+
+  * switch to using dh_lintian for override delivery
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 18 Jun 2009 14:15:42 -0600
+
 gzip (1.3.12-8) unstable; urgency=low
 
   * Add Carl Worth as an uploader.

diff --git a/debian/gzip.lintian b/debian/gzip.lintian
deleted file mode 100644 (file)
index 61fcf9e..0000000
--- a/debian/gzip.lintian
+++ /dev/null
@@ -1,6 +0,0 @@
-gzip: package-contains-hardlink bin/gunzip
-gzip: package-contains-hardlink bin/zcat
-gzip: package-contains-hardlink bin/zcmp
-gzip: package-contains-hardlink bin/zegrep
-gzip: package-contains-hardlink bin/zfgrep
-gzip: package-contains-hardlink bin/uncompress

diff --git a/debian/gzip.lintian-overrides b/debian/gzip.lintian-overrides
new file mode 100644 (file)
index 0000000..61fcf9e
--- /dev/null
+++ b/debian/gzip.lintian-overrides
@@ -0,0 +1,6 @@
+gzip: package-contains-hardlink bin/gunzip
+gzip: package-contains-hardlink bin/zcat
+gzip: package-contains-hardlink bin/zcmp
+gzip: package-contains-hardlink bin/zegrep
+gzip: package-contains-hardlink bin/zfgrep
+gzip: package-contains-hardlink bin/uncompress

diff --git a/debian/rules b/debian/rules
index 3c74108da5cdfe962a435c30d8841d48840ef6e8..ff33835ba71d17c6e595cc943b77f845cedbab67 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,17 +59,13 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-
        $(MAKE) -C build install prefix=`pwd`/debian/gzip/usr bindir=`pwd`/debian/gzip/bin 
-       install -o root -g root -m 0644 debian/gzip.lintian \
-               debian/gzip/usr/share/lintian/overrides/gzip
 
 install-win32: build-win32
        dh_testdir
        dh_testroot
        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/
 
@@ -78,6 +74,7 @@ binary-indep: build-win32 install-win32
        dh_testroot -i
        dh_installdocs -i README* TODO
        dh_installchangelogs -i ChangeLog
+       dh_lintian -i
        dh_compress -i
        dh_fixperms -i
        dh_installdeb -i
@@ -93,6 +90,7 @@ binary-arch:  build install
        dh_installinfo -s doc/gzip.info
        dh_installchangelogs -s ChangeLog
        dh_link -s
+       dh_lintian -s
        dh_strip -s
        dh_compress -s
        ln -s gunzip.1.gz debian/gzip/usr/share/man/man1/uncompress.1.gz