r234: Initial Import

5 files changed, 19 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index d90dcbed..53242d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (2.0.09) unstable; urgency=low
+
+  * dh_compress: added some FHS support. Though debhelper doesn't put stuff
+    there (and won't until people come up with a general transition strategy or
+    decide to not have a clean transiotion), dh_compress now compresses
+    various files in /usr/share/{man,doc,info}. (Closes: #40892)
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed,  7 Jul 1999 09:55:03 -0700
+
 debhelper (2.0.08) unstable; urgency=low
 
   * dh_*: redirect cd output to /den/null, because CD can actually output
diff --git a/dh_compress b/dh_compress
index 47e2ced2..73b12ba6 100755
--- a/dh_compress
+++ b/dh_compress
@@ -37,9 +37,10 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 		# extentions. ".gz", ".z", ".taz", ".tgz", "-gz", "-z", "_z"
 		
 		push @files, split(/\n/,`
-			find usr/info usr/share/info usr/man usr/share/man usr/X11*/man usr/share/X11*/man -type f ! -name "*.gz" 2>/dev/null || true;
+			find usr/info usr/share/info usr/man usr/share/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true;
 			find usr/doc usr/share/doc -type f \\( -size +4k -or -name "changelog*" \\) \\
-				! -name "*.htm*" ! -name "*.gif" ! -iname "*.gz" \\
+				\\( -name changelog.html -or ! -name "*.htm*" \\) \\
+				! -name "*.gif" ! -iname "*.gz" \\
 				! -iname "*.taz" ! -iname "*.tgz" ! -iname "*.z" \\
 				! -iname "*-gz" ! -iname "*-z" ! -iname "*_z" \\
 				! -name "copyright" 2>/dev/null || true
diff --git a/dh_compress.1 b/dh_compress.1
index 66f20122..b0eba3ea 100644
--- a/dh_compress.1
+++ b/dh_compress.1
@@ -27,10 +27,11 @@ Here is a sample debian/compress file that causes dh_compress to compress
 the same files as it would by default. This is a good starting point for
 customization of what files are compressed:
 .PP
- find usr/info usr/share/info usr/man usr/share/man usr/X11*/man usr/share/X11*/man -type f
+ find usr/info usr/share/info usr/man usr/share/man usr/X11*/man -type f
  find usr/doc usr/share/doc -type f \\ 
  	\\( -size +4k -or -name "changelog*" \\) \\
- 	! -name "*.htm*" ! -name "*.gif" ! -iname "*.gz" \\
+ 	\\( -name changelog.html -or ! -name "*.htm*" \\) \\
+ 	! -name "*.gif" ! -iname "*.gz" \\
  	! -iname "*.taz" ! -iname "*.tgz" ! -iname "*.z" \\
  	! -name "copyright"
 .SH OPTIONS
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 877aa822..4be52020 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -47,6 +47,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 			# HTML changelog
 			doit("install","-o","root","-g","root","-p","-m644",
 				$upstream,"$TMP/usr/doc/$PACKAGE/changelog.html");
+			doit("ln", "-sf", 'changelog.html',
+				"$TMP/usr/doc/$PACKAGE/changelog");
 		}
 		else {
 			doit("install","-o","root","-g","root","-p","-m644",
diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1
index 436ba947..b346eef7 100644
--- a/dh_installchangelogs.1
+++ b/dh_installchangelogs.1
@@ -19,7 +19,8 @@ If an upstream changelog file is specified as an option, and the package is
 not a native debian package, then this upstream changelog will be installed
 as usr/doc/package/changelog in the package build directory. If the
 changelog is a html file (determined by file extention), it will be
-installed as usr/doc/package/changelog.html instead.
+installed as usr/doc/package/changelog.html instead (with a link to
+usr/doc/package/changelog).
 .SH OPTIONS
 .TP
 .B debhelper options