6 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index ff7e16bcf1..9f4f2bab69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ samba (2:3.4.5~dfsg-2) UNRELEASED; urgency=low
   * No longer maker (u)mount.cifs setuid root. Add a notice
     about this in the package's NEWS.Debian file
     Closes: #567554 
+  * Use dh_lintian instead of manual install of lintian overrides
 
  -- Steve Langasek <vorlon@debian.org>  Mon, 25 Jan 2010 20:28:24 -0800
 
diff --git a/debian/control b/debian/control
index 6a2e126e83..861930e03d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint@lists.alioth.debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>, Noèl Köthe <noel@debian.org>, Jelmer Vernooij <jelmer@debian.org>
-Build-Depends: debhelper (>= 6.0.0), libpam0g-dev, libreadline-dev,
+Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
 	libcups2-dev | libcupsys2-dev,
 	libacl1-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
diff --git a/debian/rules b/debian/rules
index fb9d4a855f..e9603bd626 100755
--- a/debian/rules
+++ b/debian/rules
@@ -229,9 +229,7 @@ binary-arch: build install
 	DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
 	DH_OPTIONS= dh_installinit -pwinbind
 	dh_installcron 
-	for pkg in samba samba-common winbind; do \
-	  install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
-	done
+	dh_lintian
 	dh_installchangelogs -Nlibpam-smbpass
 	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
 	DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
diff --git a/debian/samba-common.lintian b/debian/samba-common.lintian-overrides
index 679047ed0f..679047ed0f 100644
--- a/debian/samba-common.lintian
+++ b/debian/samba-common.lintian-overrides
diff --git a/debian/samba.lintian b/debian/samba.lintian-overrides
index d2dbd5b374..d2dbd5b374 100644
--- a/debian/samba.lintian
+++ b/debian/samba.lintian-overrides
diff --git a/debian/winbind.lintian b/debian/winbind.lintian-overrides
index 9ecb2e2b69..9ecb2e2b69 100644
--- a/debian/winbind.lintian
+++ b/debian/winbind.lintian-overrides