Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_builddeb

diff --git a/dh_builddeb b/dh_builddeb
index a634be2efca5a20e6a1993245341e59d77a929fe..8c3930fb7c5dd4f7b8c2cac5a3f06b8b21617f75 100755 (executable)
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_builddeb - build debian packages
+dh_builddeb - build debian binary packages
 
 =cut
 
@@ -60,9 +60,26 @@ else {
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
        if (exists $ENV{DH_ALWAYS_EXCLUDE} && length $ENV{DH_ALWAYS_EXCLUDE}) {
-               complex_doit("find $tmp -name $ENV{DH_ALWAYS_EXCLUDE} | xargs rm -rf");
+               if (! compat(5)) {
+                       complex_doit("find $tmp $dh{EXCLUDE_FIND} | xargs rm -rf");
+               }
+               else {
+                       # Old broken code here for compatibility. Does not
+                       # remove everything.
+                       complex_doit("find $tmp -name $_ | xargs rm -rf")
+                               foreach split(":", $ENV{DH_ALWAYS_EXCLUDE});
+               }
+       }
+       if (! is_udeb($package)) {
+               doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME});
+       }
+       else {
+               my $filename=$dh{FILENAME};
+               if (! $filename) {
+                       $filename="/".udeb_filename($package);
+               }
+               doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$filename);
        }
-       doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME});
 }
 
 =head1 SEE ALSO