[debhelper-devel] [debhelper] 01/01: Remove references to usr/{man, info, X11*/man}

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit af55b01fe8f0f2ddf2e35ac95c43e378938f335a
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Oct 2 17:19:46 2016 +0000

    Remove references to usr/{man,info,X11*/man}
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_compress      | 2 +-
 dh_fixperms      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c99707..7630d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debhelper (10.2.2) UNRELEASED; urgency=medium
   * Deprecate all compat levels lower than 9.
   * dh: Discard override log files before running rather than
     after.
+  * dh_compress,dh_fixperms: Remove references to long
+    obsolete directories such as usr/info, usr/man and
+    usr/X11*/man.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 02 Oct 2016 09:52:08 +0000
 
diff --git a/dh_compress b/dh_compress
index 55f7386..dfb076e 100755
--- a/dh_compress
+++ b/dh_compress
@@ -110,7 +110,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		# complete list of such extensions: ".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 -type f ! -iname "*.gz" \\
+			find usr/share/info usr/share/man -type f ! -iname "*.gz" \\
 				! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
 				! -iname "*.jpeg" \\
 				2>/dev/null || true;
diff --git a/dh_fixperms b/dh_fixperms
index 214a091..79c2b18 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -86,7 +86,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		"| xargs -0r chmod 0755");
 
 	# Executable man pages are a bad thing..
-	complex_doit("find $tmp/usr/share/man $tmp/usr/man/ $tmp/usr/X11*/man/ -type f",
+	complex_doit("find $tmp/usr/share/man -type f",
 		"$find_options -print0 2>/dev/null | xargs -0r chmod 0644");
 
 	# ..and header files ..

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git