[debhelper-devel] Bug#815506: dh_install: not-installed requires debian/tmp/ prefix

[Sven Joachim]

On 2016-02-21 23:12 +0100, Felix Geyer wrote:

> Package: debhelper
> Version: 9.20160115
> Severity: normal
>
> Hi,
>
> Contrary to *.install files the lines in debian/not-installed require a
> debian/tmp/ prefix.
>
> For example this d/not-installed file doesn't work:
> usr/bin/passenger-install-nginx-module
>
> While this works:
> debian/tmp/usr/bin/passenger-install-nginx-module
>
> This seems unnecessary and is not documented.
> It would be great if dh_install could add the prefix automatically.

Something like this should do the trick (lightly tested):

--8<---------------cut here---------------start------------->8---
diff --git a/dh_install b/dh_install
index f7d5739..d7e849b 100755
--- a/dh_install
+++ b/dh_install
@@ -262,8 +262,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.
--8<---------------cut here---------------end--------------->8---

Maybe there's a better way to achieve this goal, I'm not really a
debhelper or perl guru.

Cheers,
       Sven