r81: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 24830908dce264b36f73afcadcf7d3a0d786e3dc..0ddba87b088447c5ef3747a76fae11bb178331d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.84) unstable; urgency=low
+
+  * Applied Che_Fox'x patches to example rules files, which makes them use
+    an install target internally to move things into place in debian/tmp.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  9 Apr 1998 12:08:45 -0700
+
 debhelper (0.83) unstable; urgency=low
 
   * Generate symlinks in build stage of debian/rules. cvs cannot create them

diff --git a/examples/rules b/examples/rules
index 631e5cb72db9c79586a33096f24bca06900e081a..7f339dc9c6b15323f0a690c85fae59f4ffd7b8b2 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -28,7 +28,8 @@ install: install-stamp
 install-stamp: build
        dh_testdir
        dh_testroot
-       dh_clean
+       dh_clean -k
+       dh_installdirs
 
        # Add here commands to install the package into debian/tmp.
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
@@ -44,8 +45,6 @@ binary-arch: build install
 #      dh_testversion
        dh_testdir
        dh_testroot
-       dh_clean -k
-       dh_installdirs
        dh_installdocs
        dh_installexamples
        dh_installmenu

diff --git a/examples/rules.multi b/examples/rules.multi
index 92e2e83025acc56ebda35b41b9dece33f9265367..32eeddfec6385c8adb0571bf24e03799d5943e85 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -31,7 +31,8 @@ install: install-stamp
 install-stamp: build
        dh_testdir
        dh_testroot
-       dh_clean
+       dh_clean -k
+       dh_installdirs
 
        # Add here commands to install the package into debian/tmp.
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
@@ -43,8 +44,6 @@ binary-indep: build install
 #      dh_testversion
        dh_testdir -i
        dh_testroot -i
-       dh_clean -i -k
-       dh_installdirs -i
        dh_movefiles -i
        dh_installdocs -i
        dh_installexamples -i
@@ -67,8 +66,6 @@ binary-arch: build install
 #      dh_testversion
        dh_testdir -a
        dh_testroot -a
-       dh_clean -a -k
-       dh_installdirs -a
        dh_movefiles -a
        dh_installdocs -a
        dh_installexamples -a