releasing version 6.0.0

[debhelper.git] / dh_installexamples

diff --git a/dh_installexamples b/dh_installexamples
index 0f3651cfa85c68dd5277164219ffbd89c038ce9a..4e0bace0d66d7a60c48ed540b1e687d35c8db40b 100755 (executable)
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -78,9 +78,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        doit("install","-d","$tmp/usr/share/doc/$package/examples");
                }
                
-               my $exclude = '';
+               my $exclude = '-type f';
                if ($dh{EXCLUDE_FIND}) {
-                       $exclude = ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
+                       $exclude .= ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
                }
                
                foreach my $example (@examples) {
@@ -89,7 +89,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                my ($dir_basename) = basename($example);
                                my $pwd=`pwd`;
                                chomp $pwd;
-                               complex_doit("cd '$example/..' && find '$dir_basename' -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
+                               complex_doit("cd '$example/..' && find '$dir_basename' $exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
                        }
                        else {
                                doit("cp", "-a", $example, "$tmp/usr/share/doc/$package/examples");