[debhelper-devel] [debhelper] 01/01: dh_install: Make d/tmp prefix optional in d/not-installed

[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 c26e9e7f287c24ad48a1548dc7f99076eeea0dbf
Author: Sven Joachim <svenjoac at gmx.de>
Date:   Sun Jul 31 18:42:35 2016 +0000

    dh_install: Make d/tmp prefix optional in d/not-installed
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_install       | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8223902..b5963a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ debhelper (9.20160709+unreleased) UNRELEASED; urgency=medium
     assist with the fix for CVE-2016-1238.  (Closes: #832436)
   * dh_install: Clarify that "debian/not-installed" is not
     related to the --exclude parameter.
+  * dh_install: Apply patch from Sven Joachim to support
+    the "debian/tmp" prefix being optional in
+    "debian/not-installed".  (Closes: #815506)
 
  -- Niels Thykier <niels at thykier.net>  Sat, 09 Jul 2016 11:51:46 +0000
 
diff --git a/dh_install b/dh_install
index 4f805ff..5275056 100755
--- a/dh_install
+++ b/dh_install
@@ -264,8 +264,12 @@ if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
 	
 	my @missing;
 	if ( -f 'debian/not-installed') {
+		my @not_installed = filearray('debian/not-installed');
+		foreach (@not_installed) {
+		  s:^\s*:debian/tmp/: unless m:^\s*debian/tmp/:;
+		}
 		# Pretend that these are also installed.
-		push(@installed, filearray('debian/not-installed'));
+		push(@installed, @not_installed);
 	}
 	my $installed=join("|", map {
 		# Kill any extra slashes, for robustness.

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