New debhelper version installs in debian/$package, adjust debian/rules appropriately.

diff --git a/debian/changelog b/debian/changelog
index 52d890e..fa2cc06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ userdir-ldap-cgi (0.3.40) UNRELEASED; urgency=medium
   * Use a bit more modern perl in Util.pm, drop defined for an array check.
   * Add debian/compat with level 10.
   * Add missing Build-Depends for libhtml-parser-perl.
+  * New debhelper version installs in debian/$package, adjust debian/rules
+    appropriately.
 
  -- Peter Palfrader <weasel@debian.org>  Sat, 03 Jan 2015 13:56:47 +0100
 

diff --git a/debian/rules b/debian/rules
index bf81c9b..f957549 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 package:=userdir-ldap-cgi
-i:=./debian/tmp
+i:=./debian/$(package)
 
 build:
        dh_testdir
@@ -14,7 +14,7 @@ build:
 clean:
        dh_testdir
        -rm -f build
-       -rm -rf $(i) debian/files* core debian/substvars debian/debhelper.log html/*.html
+       -rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html
 
 instdirs = \
        var/www/userdir-ldap \