[debhelper-devel] [debhelper] 01/01: Revert to the pre-10.6.4 behavior for dh_installdocs and the like

[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 063c761fda757ef24ff43f57911f4f461c8fd0dc
Author: Sven Joachim <svenjoac at gmx.de>
Date:   Thu Jul 20 20:46:26 2017 +0200

    Revert to the pre-10.6.4 behavior for dh_installdocs and the like
    
    It turned out that "dh_installdocs 'foo bar'" has historically treated
    the argument as a single file rather than two, and packages were
    relying on it, since there is really no other way to install such a
    file with dh_installdocs.  Hence commit d00d7d524f8 broke them.
    
    The situation for dh_installexamples, dh_installman and dh_installinfo
    is exactly the same.
    
    That dh_install has behaved differently in this respect is
    unfortunate, but can only be fixed in a new compat level.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog   | 6 ++++++
 dh_installdocs     | 3 +--
 dh_installexamples | 3 +--
 dh_installinfo     | 3 +--
 dh_installman      | 3 +--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f47b23..d43e5c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,12 @@ debhelper (10.7) UNRELEASED; urgency=medium
     on dh_testdir to do this as dh_testdir is called too late.
   * dh: optimize out the call to dh_testdir.  It is useless for
     printing a helpful error message when called by dh.
+  * dh_installdocs: Apply patch from Sven Joachim to revert an
+    incorrect regression "fix".  Thanks to Adrian Bunk for
+    reporting the issue.  (Closes: #868649)
+  * dh_installexamples: Ditto.
+  * dh_installinfo: Ditto.
+  * dh_installman: Ditto.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 15 Jul 2017 09:42:32 +0000
 
diff --git a/dh_installdocs b/dh_installdocs
index a85d056..caa630f 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -235,8 +235,7 @@ foreach my $package (getpackages()) {
 	}
 
 	if (($package eq $dh{FIRSTPACKAGE} || ($dh{PARAMS_ALL} && !$link_doc)) && @ARGV) {
-		# The split is for bug-backwards compatibility (#867866).
-		push(@docs, map { split } @ARGV);
+		push @docs, @ARGV;
 	}
 
 	log_installed_files($package, @docs);
diff --git a/dh_installexamples b/dh_installexamples
index ce3d7aa..f11d1c5 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -99,8 +99,7 @@ foreach my $package (getpackages()) {
 	}	
 
 	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
-		# The split is for bug-backwards compatibility (#867866).
-		push(@examples, map { split } @ARGV);
+		push @examples, @ARGV;
 	}
 
 	log_installed_files($package, @examples);
diff --git a/dh_installinfo b/dh_installinfo
index eeaa395..1574394 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -82,8 +82,7 @@ foreach my $package (getpackages()) {
 	}
 
 	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
-		# The split is for bug-backwards compatibility (#867866).
-		push(@info, map { split } @ARGV);
+		push @info, @ARGV;
 	}
 
 	next if not process_pkg($package) or $nodocs;
diff --git a/dh_installman b/dh_installman
index d25f31e..cfaa6bc 100755
--- a/dh_installman
+++ b/dh_installman
@@ -161,8 +161,7 @@ on_items_in_parallel(\@all_packages, sub {
 		@manpages = filearray($file, \@search_dirs, $error_handler) if $file;
 
 		if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
-			# The split is for bug-backwards compatibility (#867866).
-			push(@manpages, map { split } @ARGV);
+			push @manpages, @ARGV;
 		}
 
 		log_installed_files($package, @manpages);

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