install binary with dh_install from debian/rules; further cleanup

diff --git a/debian/changelog b/debian/changelog
index 7db63fb999018fc6ef900ba6ee9020f90d1db7f8..8ed0f8cee4c553fe68f55141f8bc6ff650caf5ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ cpulimit (1.1-11) unstable; urgency=low
     usage.
   * Create install-stamp target in debian/rules and re-arrange dependencies.
   * Change debian/copyright to the new machine-readable format.
-  * Drop debian/dirs, create /usr/bin directly from debian/rules.
+  * Drop debian/dirs, install binary with dh_install from debian/rules.
   * Set debhelper compatibility level to 6.
   * debian/rules: remove configure and configure-stamp targets.
   * Switch patch system from dpatch to quilt.

diff --git a/debian/rules b/debian/rules
index 8af35f50633fd8fad0a462f322584baef66abfad..2bb7920f6984eaa958475dcc1adb1f90dec41de4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,17 +28,16 @@ build-stamp: $(QUILT_STAMPFN)
 clean: unpatch
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp install-stamp
+       rm -f build-stamp build-stamp install-stamp
        [ ! -f Makefile ] || $(MAKE) clean
-       dh_clean 
+       dh_clean
 
 install: install-stamp
 install-stamp: build-stamp
        dh_testdir
        dh_testroot
-       dh_clean -k 
-       dh_installdirs usr/bin
-       install cpulimit $(CURDIR)/debian/cpulimit/usr/bin
+       dh_clean -k
+       dh_install cpulimit usr/bin
        touch $@
 
 # Build architecture-independent files here.
@@ -49,7 +48,7 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs 
+       dh_installchangelogs
        dh_installdocs
        dh_installman debian/cpulimit.1
        dh_strip