[debhelper-devel] [debhelper] 06/12: Fix dh_install to handle absolute path specs

[Niels Thykier]

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

nthykier pushed a commit to annotated tag Version_9.20130630co2endless10
in repository debhelper.

commit 8c8ba0feda7de3fb57d73bf301f0ebb307d60218
Author: Dan Nicholson <nicholson at endlessm.com>
Date:   Fri Jun 27 05:57:27 2014 -0700

    Fix dh_install to handle absolute path specs
    
    Handle absolute paths install file specifications. These paths are
    always relative to the debian build directories, so the leading / is
    meaningless and can be stripped out.
    
    [endlessm/eos-shell#2853]
---
 debian/changelog |  8 ++++++++
 dh_install       | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41f053f..b8df70e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (9.20130630co2endless4) eos; urgency=low
+
+  * dh_install: Handle absolute paths install file specifications. These
+    paths are always relative to the debian build directories, so the
+    leading / is meaningless and can be stripped out.
+
+ -- Dan Nicholson <nicholson at endlessm.com>  Fri, 27 Jun 2014 05:57:27 -0700
+
 debhelper (9.20130630co2endless3) eos; urgency=medium
 
   * Debian/Debhelper/Buildsystem/cmake.pm:
diff --git a/dh_install b/dh_install
index 993178a..aea491d 100755
--- a/dh_install
+++ b/dh_install
@@ -166,17 +166,17 @@ foreach my $package (getpackages()) {
 			$dest=pop @$set;
 
 			# Adjust the destination if app prefix is set.
-			$dest=~s,^usr/,${prefix}/, if defined $prefix;
-			$dest=~s,^etc/,${prefix}/etc/, if defined $prefix;
-			$dest=~s,^var/,${prefix}/var/, if defined $prefix;
+			$dest=~s,^/*usr/,${prefix}/, if defined $prefix;
+			$dest=~s,^/*etc/,${prefix}/etc/, if defined $prefix;
+			$dest=~s,^/*var/,${prefix}/var/, if defined $prefix;
 		}
 
 		my @filelist;
 		foreach my $glob (@$set) {
 			# Adjust the glob if app prefix is set.
-			$glob=~s,^usr/,${prefix}/, if defined $prefix;
-			$glob=~s,^etc/,${prefix}/etc/, if defined $prefix;
-			$glob=~s,^var/,${prefix}/var/, if defined $prefix;
+			$glob=~s,^/*usr/,${prefix}/, if defined $prefix;
+			$glob=~s,^/*etc/,${prefix}/etc/, if defined $prefix;
+			$glob=~s,^/*var/,${prefix}/var/, if defined $prefix;
 
 			my @found = glob "$srcdir/$glob";
 			if (! compat(6)) {

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