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

[debhelper.git] / dh_installdeb

diff --git a/dh_installdeb b/dh_installdeb
index 519afb0c8fea168db3ac0a52866067bc1e5a84be..fdc76e60e8c114feac1a8b85d6282d2171326724 100755 (executable)
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -27,6 +27,7 @@ the DEBIAN directory:
   package.prerm
   package.shlibs
   package.conffiles
+  package.triggers
 
 The postinst, preinst, postrm, and prerm are handled specially: If a
 corresponding file named debian/package.script.debhelper exists, the contents
@@ -66,17 +67,19 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                debhelper_script_subst($package, $script);
        }
 
-       # Install non-executable files
-       foreach my $file (qw{shlibs conffiles}) {
-               my $f=pkgfile($package,$file);
-               if ($f) {
-                       doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
+       if (! is_udeb($package)) {
+               # Install non-executable files
+               foreach my $file (qw{shlibs conffiles triggers}) {
+                       my $f=pkgfile($package,$file);
+                       if ($f) {
+                               doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
+                       }
                }
        }
 
        # Automatic conffiles registration: If it is in /etc, it is a
        # conffile.
-       if (! compat(2) && -d "$tmp/etc") {
+       if (! compat(2) && -d "$tmp/etc" && ! is_udeb($package)) {
                complex_doit("find $tmp/etc -type f -printf '/etc/%P\n' >> $tmp/DEBIAN/conffiles");
                # Anything found?
                if (-z "$tmp/DEBIAN/conffiles") {