r30: Initial Import

5 files changed, 12 insertions, 5 deletions

diff --git a/BUGS b/BUGS
index 3a33f32e..51a7b613 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,5 @@
 dh_compress: doesn't verbose echo that it's cd'd to $TMP. 
 dh_installdirs, dh_md5sums: uses ../.. to cd back to original location, but
 	we don't know that $TMP is 2 levels deep.
+dh_compress: refers to ../compress (meaning debian/compress), but we don't
+know that this will work - exp if $TMP is not under debian/.
diff --git a/debian/changelog b/debian/changelog
index d453632c..209cfb66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.24) unstable; urgency=low
+
+  * dh_clean: no longer clean up empty (0 byte) files (#15240).
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 25 Nov 1997 14:29:37 -0500
+
 debhelper (0.23) unstable; urgency=low
 
   * Now depends on fileutils (>= 3.16-4), becuase with any earlier version
diff --git a/dh_clean b/dh_clean
index 73c094fe..8e92fc8d 100755
--- a/dh_clean
+++ b/dh_clean
@@ -14,9 +14,8 @@ for PACKAGE in $DH_DOPACKAGES; do
 done
 doit "rm -f debian/files* debian/*.debhelper $*"
 
-# Remove other temp files. doit isn't smart enough to handle this, so I echo
-# by hand (sigh).
+# Remove other temp files.
 doit "find . \( -name '#*#' -o -name '*~' -o -name DEADJOE -o -name '*.orig' \
 	-o -name '*.rej' -o -name '*.bak' -o -name '.*.orig' \
 	-o -name '.*.rej' -o -name .SUMS -o -name TAGS -o -name core \
-	-o -size 0 \) -exec rm -f {} \;"
+	\) -exec rm -f {} \;"
diff --git a/examples/rules b/examples/rules
index 86ec8a70..10661223 100755
--- a/examples/rules
+++ b/examples/rules
@@ -15,9 +15,9 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	dh_clean
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) distclean
+	dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build
diff --git a/examples/rules.multi b/examples/rules.multi
index 1fce1c0b..496c3366 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -18,9 +18,9 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	dh_clean
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) distclean
+	dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build