[debhelper-devel] [debhelper] 01/02: dh_installman: In c11, detect manpage language from path

[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 b794be983d211ce46fbbc45adfd5e89900c8ee44
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jun 25 10:02:31 2017 +0000

    dh_installman: In c11, detect manpage language from path
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod    | 7 ++++++-
 debian/changelog | 5 +++++
 dh_installman    | 5 +++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index 65b2ef8..e19a6c8 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -650,7 +650,7 @@ which can also see the files installed by other helpers.
 
 =item -
 
-The B<--no-restart-on-upgrade> option in dh_installinit has been removed.
+The B<--no-restart-on-upgrade> option in B<dh_installinit> has been removed.
 Please use the new name B<--no-stop-on-upgrade>
 
 =item -
@@ -658,6 +658,11 @@ Please use the new name B<--no-stop-on-upgrade>
 The B<autoconf> buildsystem now passes B<--runstatedir=/run> to
 F<./configure>.
 
+=item -
+
+The B<dh_installman> helper will now prefer detecting the language from the
+path name rather than the extension.
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 49adc21..b4809ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,11 @@ debhelper (10.5) UNRELEASED; urgency=medium
     (Closes: #865708)
   * dh_installcatalogs: Use explicit await triggers to avoid trigger
     a lintian warning.
+  * dh_installman: In compat 11, attempt to detect the language of the
+    manpage based on the directory (/man/<LANG>/manX/) before using the
+    extention.  This is more reliably for packages using dh_installman
+    to install manpages from the temporary install dir.
+    (Closes: #761024)
 
   [ Iain Lane ]
   * Dh_Lib: Re-add warning + exit 0 for the -i/-a shortcut that was
diff --git a/dh_installman b/dh_installman
index 29f93f7..59514ef 100755
--- a/dh_installman
+++ b/dh_installman
@@ -191,8 +191,9 @@ on_selected_pkgs_in_parallel(\@all_packages, sub {
 				# language code to the filename, so detect that and
 				# redirect to appropriate directory, stripping the code.
 				($langcode) = $basename =~ m/\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
-			}
-			elsif ($dh{LANGUAGE} ne 'C') {
+			} elsif (not compat(10) and $page =~ m{/man/([a-z][a-z](?:_[A-Z][A-Z])?)(?:\.[^/]+)?/man[1-9]/}) {
+				$langcode = $1;
+			} elsif ($dh{LANGUAGE} ne 'C') {
 				$langcode = $dh{LANGUAGE};
 			}
 

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