From: Julien Cristau <jcristau@debian.org>
Date: Mon, 21 Oct 2019 20:06:24 +0000 (+0200)
Subject: Fix a few lintian warnings.
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=cef362b59aff2c7284375fa4dd0d8df5d6b8452a

Fix a few lintian warnings.
---

diff --git a/.gitignore b/.gitignore
index 624dd23..0d443e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-build
 debian/debhelper.log
 debian/files
 debian/tmp/
diff --git a/debian/changelog b/debian/changelog
index db0612f..9c57c56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ userdir-ldap-cgi (0.3.43~) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Add build-dependency on libgd-perl.
   * Remove Stephen Gran from Uploaders.
+  * Fix a few lintian warnings.
 
   [ Adam D. Barratt ]
   * Documentation updates and fixes.
diff --git a/debian/control b/debian/control
index 5aae55e..6e968a1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian Administration team <debian-admin@lists.debian.org>
 Build-Depends:
- debhelper,
+ debhelper (>= 10),
  wml,
  isoquery,
  iso-codes,
diff --git a/debian/rules b/debian/rules
index 3ca3dab..f6b9222 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,15 +6,16 @@
 package:=userdir-ldap-cgi
 i:=./debian/$(package)
 
-build:
+build: build-indep
+
+build-indep:
 	dh_testdir
 	$(MAKE) -C html
-	touch build
 
 clean:
 	dh_testdir
-	-rm -f build
-	-rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html
+	dh_clean
+	-rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html html/domains.tab
 
 instdirs = \
 	var/www/userdir-ldap \
@@ -28,7 +29,7 @@ instdirs = \
 binary-indep: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs $(instdirs)
 	dh_installdocs
 
@@ -77,4 +78,4 @@ binary-arch: build
 
 binary:	binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: build build-indep binary binary-arch binary-indep clean