From 97f0356f8695f1830d2b3073187971b2ee3e7b21 Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 04:50:57 +0000
Subject: [PATCH] r82: Initial Import

---
 debian/changelog     | 13 +++++++++++++
 debian/control       |  2 +-
 dh_compress          |  4 ++--
 examples/rules.indep |  5 ++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ddba87..0103f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+debhelper (0.85) unstable; urgency=low
+
+  * Moved a few things around that were broken by Che's patch:
+    - dh_installdirs should go in install target.
+    - dh_clean should not run in binary targets.
+  * This is just a quick fix to make it work, I'm not happy with it. I'm
+    going to discuss my problems with it with Che, and either make a new
+    version fixing them, or revert to 0.83.
+  * So be warned that the example rules files are not currently in good
+    shape if you're starting a new package.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 18 Apr 1998 23:30:38 -0700
+
 debhelper (0.84) unstable; urgency=low
 
   * Applied Che_Fox'x patches to example rules files, which makes them use
diff --git a/debian/control b/debian/control
index d35fa0a..4ec15b0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@master.debian.org>
-Standards-Version: 2.4.0.0
+Standards-Version: 2.4.1.0
 
 Package: debhelper
 Architecture: all
diff --git a/dh_compress b/dh_compress
index 5af172c..27f931f 100755
--- a/dh_compress
+++ b/dh_compress
@@ -22,9 +22,9 @@ for PACKAGE in $DH_DOPACKAGES; do
 	else
 		# By default fall back on what the policy manual says to compress.
 		files=`
-			find usr/info usr/man usr/X11*/man -type f 2>/dev/null ;
+			find usr/info usr/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null ;
 			find usr/doc -type f \( -size +4k -or -name "changelog*" \) \
-				! -name "*.htm*" ! -name "*.gif" \
+				! -name "*.htm*" ! -name "*.gif" ! -name "*.gz" \
 				! -name "copyright" 2>/dev/null ;
 			true
 			`
diff --git a/examples/rules.indep b/examples/rules.indep
index 08ce4b6..d0cce46 100755
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -29,7 +29,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
@@ -41,8 +42,6 @@ binary-indep: build install
 #	dh_testversion
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-- 
2.39.5