Use dh_lintian to install lintian overrides

debian/changelog

@@ -146,6 +146,9 @@ dpkg (1.15.0) UNRELEASED; urgency=low
     until all maintainer scripts are fixed (see
     http://lintian.debian.org/tags/command-with-path-in-maintainer-script.html).
     Closes: #216606
+  * Use dh_lintian to install lintian overrides. Build-Depends on debhelper
+    (>= 6.0.7) for this. Update debhelper compatility level to 6 at the same
+    time.
 
   [ Pierre Habouzit ]
   * Add a --query option to update-alternatives. Closes: #336091, #441904

debian/compat

@@ -1 +1 @@
-4
+6

debian/control

@@ -10,7 +10,7 @@ Homepage: http://wiki.debian.org/Teams/Dpkg
 Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
 Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.33.1),
+Build-Depends: debhelper (>= 6.0.7), pkg-config, po4a (>= 0.33.1),
  libncursesw5-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, flex,
  libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libtimedate-perl, libio-string-perl

debian/rules

@@ -92,14 +92,7 @@ binary-arch: install
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
 	dh_link -a
-
-	install -d debian/dpkg/usr/share/lintian/overrides
-	install -m 644 debian/dpkg.lintian-overrides \
-		       debian/dpkg/usr/share/lintian/overrides/dpkg
-	install -d debian/dselect/usr/share/lintian/overrides
-	install -m 644 debian/dselect.lintian-overrides \
-		       debian/dselect/usr/share/lintian/overrides/dselect
-
+	dh_lintian -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
@@ -118,11 +111,7 @@ binary-indep: install
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
 	dh_link -i
-
-	install -d debian/dpkg-dev/usr/share/lintian/overrides
-	install -m 644 debian/dpkg-dev.lintian-overrides \
-		       debian/dpkg-dev/usr/share/lintian/overrides/dpkg-dev
-
+	dh_lintian -i
 	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
@@ -138,6 +127,7 @@ binary: binary-arch binary-indep
 clean:
 	dh_testdir
 
+	[ ! -f Makefile ] || make distclean
 	rm -rf build-tree
 	dh_clean