r574: * wiggy didn't take my hint about making update-modules send warnings to

     stderr, so its overly verbose stdout is now directed to /dev/null to
     prevent conflicts with debconf. Closes: #150804
   * dh_fixperms: only skip examples directories which in a parent of
     usr/share/doc, not in a deeper tree. Closes: #152602
   * dh_compress: stop even looking at usr/doc

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index bcd7c34b32d24611282d1b3e7e7870db8d4d6dfb..babf39bd09971cf120ab7229c9e2b932bdf884d4 100644 (file)
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,3 +1,3 @@
 if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
-       update-modules
+       update-modules >/dev/null
 fi

diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
index fdf249efc66ca386aab9f43cfb81e82b5c86233e..f2d4cb7a3c3ce034d452f4290ae4e02f8cd8e5a5 100644 (file)
--- a/autoscripts/postrm-modules
+++ b/autoscripts/postrm-modules
@@ -1,3 +1,3 @@
 if [ -x /sbin/update-modules ]; then
-       update-modules
+       update-modules >/dev/null
 fi

diff --git a/debian/changelog b/debian/changelog
index 3683986df2b02a529e0d908d57cdf563eee6f7e7..931467da79e958efc8b350c757f2deb3f6fa884d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debhelper (4.1.33) unstable; urgency=low
+
+  * wiggy didn't take my hint about making update-modules send warnings to
+    stderr, so its overly verbose stdout is now directed to /dev/null to
+    prevent conflicts with debconf. Closes: #150804
+  * dh_fixperms: only skip examples directories which in a parent of
+    usr/share/doc, not in a deeper tree. Closes: #152602
+  * dh_compress: stop even looking at usr/doc
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 22 Feb 2003 14:45:32 -0500
+
 debhelper (4.1.32) unstable; urgency=low
 
   * dh_md5sums: note that it's used by debsums. Closes: #181521

diff --git a/dh_compress b/dh_compress
index eaa17177b5b7bc41cdc6b8fc7145df1cb651a79b..de6a97b9502ffa31a844ca620538cdef305e6e7b 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -95,7 +95,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # ".tgz", "-gz", "-z", "_z"
                push @files, split(/\n/,`
                        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*" -or -name "NEWS*" \\) \\
+                       find usr/share/doc -type f \\( -size +4k -or -name "changelog*" -or -name "NEWS*" \\) \\
                                \\( -name changelog.html -or ! -iname "*.htm*" \\) \\
                                ! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
                                ! -iname "*.jpeg" ! -iname "*.gz" ! -iname "*.taz" \\

diff --git a/dh_fixperms b/dh_fixperms
index 39001a54be230dbd003e10cf3d19bc71e520812f..d6b0f721487b48e5f5f085863e47a62d3db34587 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -59,9 +59,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                
        # Fix up premissions in usr/share/doc, setting everything to not
        # executable by default, but leave examples directories alone.
-       complex_doit("find $tmp/usr/share/doc $tmp/usr/doc -type f $find_options ! -regex '.*/examples/.*' -print0 2>/dev/null",
+       complex_doit("find $tmp/usr/share/doc -type f $find_options ! -regex '$tmp/usr/share/doc/[^/]*/examples/.*' -print0 2>/dev/null",
                "| xargs -0r chmod 644");
-       complex_doit("find $tmp/usr/share/doc $tmp/usr/doc -type d $find_options -print0 2>/dev/null",
+       complex_doit("find $tmp/usr/share/doc -type d $find_options -print0 2>/dev/null",
                "| xargs -0r chmod 755");
 
        # Executable man pages are a bad thing..