r22: Initial Import

diff --git a/debian/changelog b/debian/changelog
index f7d47b1774125b8303118ba7fbbac1159ea0636e..b6a5a4960132555d7509c25d2c36765328babbfe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.16) unstable; urgency=low
+
+  * dh_compress: always compress changelog and upstream changelog, no 
+    matter what their size (#14604) (policy 5.8)
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  6 Nov 1997 19:50:36 -0500
+
 debhelper (0.15) unstable; urgency=low
 
   * README: documented what temporary directories are used by default for 

diff --git a/dh_compress b/dh_compress
index 86ab8373f70574746e6046e744d7c68da26e1aaa..a54cd2f84124d45e856d6d1044b6af1622df4b89 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -23,7 +23,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                # 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/doc -type f -size +4k \
+                       find usr/doc -type f \( -size +4k -or -name "changelog*" \) \
                                ! -name "*.htm*" ! -name "*.gif" \
                                ! -name "copyright" 2>/dev/null
                `

diff --git a/dh_compress.1 b/dh_compress.1
index d7e8dc5ca2e03401f19fef9454f8fbd13ce4139f..0e6c61981a306cd6072da45cbe98c282a011288a 100644 (file)
--- a/dh_compress.1
+++ b/dh_compress.1
@@ -13,7 +13,7 @@ to the new files.
 By default, dh_compress compresses files that debian policy mandates should
 be compressed, namely all files in usr/info, usr/man, usr/X11R6/man, and
 all files in usr/doc that are larger than 4k in size, except
-the copyright file, .html files and .gif files.
+the copyright file, .html files and .gif files, and all changelog files.
 .P
 If a debian/compress file exits, however, it will be ran as a shell script,
 and all filenames that the shell script outputs will be compressed instead
@@ -25,7 +25,8 @@ 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/man usr/X11*/man -type f
- find usr/doc -type f -size +4k \\
+ find usr/doc -type f \\
+       \\( -size +4k -or -name "changelog*" \\) \\
        ! -name "*.htm*" ! -name "*.gif" \\
        ! -name "copyright"
 .SH OPTIONS

diff --git a/examples/rules b/examples/rules
index d5170a789a9f70be069550a41b612f9c014a8e32..5d0f7085138d5c670887f12457b2f12ae0d3e63f 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -28,6 +28,7 @@ binary-arch: build
        dh_testdir
        dh_testroot
        dh_clean
+       dh_installdirs
        # Add here commands to install the files into debian/tmp
        #$(MAKE) PREFIX=debian/tmp install
        dh_installdocs