r295: * Corrected a path name in dh_installxfonts. Closes: #48315

diff --git a/autoscripts/postrm-xfonts b/autoscripts/postrm-xfonts
index 53e2b6dbce6111c58796e0492865b1036f1beac2..c8d1f7673bbdcb6c4a0bbd160eaa6809e09161f5 100644 (file)
--- a/autoscripts/postrm-xfonts
+++ b/autoscripts/postrm-xfonts
@@ -7,7 +7,7 @@ for currentdir in $fontdirs; do
                for file in fonts.dir fonts.alias; do
                        rm -f $file
                done
-               if [ $(find $currentdir| wc -l) -eq 1 ]; then
+               if [ $(find $longdir| wc -l) -eq 1 ]; then
                        rmdir -p $longdir
                else
                        for currentcmd in $updatecmds; do

diff --git a/debian/changelog b/debian/changelog
index b412a9526a2fec7cb48177be869bbfef3b5d66f2..4a28531dafce124a98aa8f11da6515d39e13dc89 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (2.0.64) unstable; urgency=low
+
+  * Corrected a path name in dh_installxfonts. Closes: #48315
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 25 Oct 1999 14:24:03 -0700
+
+debhelper (2.0.63) unstable; urgency=low
+
+  * Removed install-stamp cruft in all example rules files. Closes: #47175
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 12 Oct 1999 14:23:09 -0700
+
 debhelper (2.0.62) unstable; urgency=low
 
   * Fixed problem with dh_installemacsen options not working, patch from

diff --git a/examples/rules b/examples/rules
index 6d4880ff9cd7a2e971e69989635c0a04af5cac29..ddb8e282bbb181394f80f955d4d9d8121a968d4f 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -37,8 +37,6 @@ install: build
        # Add here commands to install the package into debian/tmp.
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
-       touch install-stamp
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

diff --git a/examples/rules.indep b/examples/rules.indep
index e2b33b49322d305ad53a62b87ba95faad4bb89fe..5ec94a3e996ed218b46d1c82f944abb73fc5b8bb 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -22,7 +22,7 @@ build-stamp:
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp install-stamp
+       rm -f build-stamp
 
        # Add here commands to clean up after the build process.
        #-$(MAKE) clean
@@ -39,8 +39,6 @@ install: build
        # Add here commands to install the package into debian/tmp.
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
-       touch install-stamp
-
 # Build architecture-independent files here.
 binary-indep: build install
 #      dh_testversion

diff --git a/examples/rules.multi b/examples/rules.multi
index 55260d7e15f6894bfb3327eb0a1dff0f5e56607b..e5a10b6ab265b7694775f7a2975ea5c59b5a2018 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -27,7 +27,7 @@ build-stamp:
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp install-stamp
+       rm -f build-stamp 
 
        # Add here commands to clean up after the build process.
        #-$(MAKE) clean
@@ -46,7 +46,6 @@ install: build
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
        dh_movefiles
-       touch install-stamp
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.

diff --git a/examples/rules.multi2 b/examples/rules.multi2
index c0e3f07c86c9b16e8b61dac3e840e31071f0ef18..9226604c2af9bf6feefe6d827d2cadc8cd68e730 100755 (executable)
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -26,7 +26,7 @@ build-stamp:
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp install-stamp
+       rm -f build-stamp
 
        # Add here commands to clean up after the build process.
        #-$(MAKE) clean
@@ -45,7 +45,6 @@ install: build
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
        dh_movefiles
-       touch install-stamp
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will