summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2002-07-06 02:59:27 +0000
committerjoey <joey>2002-07-06 02:59:27 +0000
commit620d5c492f5bfd918f3d88a8270b5e4565a41635 (patch)
tree7ebfee45fb52d83b0edeac769516ca14536f8915
parent8e3fc45ef77b9b443b7a05fdb9fc5ea56082f5e4 (diff)
r537: * In dh_install, don't limit to -type f when doing the find due to -X.
This makes it properly install syml8inks, cf my rpm bug.
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_install4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b2e10d1..ae50371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.0.17) unstable; urgency=low
+
+ * In dh_install, don't limit to -type f when doing the find due to -X.
+ This makes it properly install syml8inks, cf my rpm bug.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 5 Jul 2002 22:58:03 -0400
+
debhelper (4.0.16) unstable; urgency=low
* Patch from doogie to make dh_movefiles support -X. Closes: #150978
diff --git a/dh_install b/dh_install
index 65a9977..69f2436 100755
--- a/dh_install
+++ b/dh_install
@@ -109,7 +109,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# Support for -X flag.
my $exclude = '';
if ($dh{EXCLUDE_FIND}) {
- $exclude = ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
+ $exclude = '-and ! \( '.$dh{EXCLUDE_FIND}.' \)';
}
foreach my $set (@install) {
@@ -139,7 +139,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# Pity there's no cp --exclude ..
my $pwd=`pwd`;
chomp $pwd;
- complex_doit("cd $src/.. && find $dir_basename -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;");
+ complex_doit("cd $src/.. && find $dir_basename \\( -type f -or -type l \\) $exclude -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;");
}
else {
doit("cp", "-a", $src, "$tmp/$dest/");