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

[debhelper.git] / dh_gencontrol

diff --git a/dh_gencontrol b/dh_gencontrol
index ae8605a6c7d30160db647717191546381d228c3a..08fb680a15c9fd206f895a0c060876fb0428aa44 100755 (executable)
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_gencontrol [debhelper options] [-uparams] [-- params]
+B<dh_gencontrol> [S<I<debhelper options>>] [S<B<--> I<params>>]
 
 =head1 DESCRIPTION
 
@@ -21,13 +21,13 @@ proper permissions.
 
 This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls
 it once for each package being acted on, and passes in some additional
-useful flags including "-isp". 
+useful flags.
 
 =head1 OPTIONS
 
 =over 4
 
-=item B<-u>I<params>, B<--dpkg-gencontrol-params>I<params>
+=item B<-u>I<params>, B<--dpkg-gencontrol-params>=I<params>
 
 =item B<--> I<params>
 
@@ -53,19 +53,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        # Generate and install control file.
-       doit("dpkg-gencontrol","-l$changelog","-isp","-p$package",
-                    "-Tdebian/${ext}substvars", "-P$tmp",@{$dh{U_PARAMS}});
+       my @command="dpkg-gencontrol";
+       if (getpackages() > 1) {
+               push @command, "-p$package";
+       }
+       if (is_udeb($package)) {
+               push @command, "-n".udeb_filename($package);
+       }
+       doit(@command, "-l$changelog", "-Tdebian/${ext}substvars", 
+               "-P$tmp",@{$dh{U_PARAMS}});
 
        # This chmod is only necessary if the user sets the umask to
        # something odd.
        doit("chmod","644","$tmp/DEBIAN/control");
        
-       doit("chown","0.0","$tmp/DEBIAN/control");
+       doit("chown","0:0","$tmp/DEBIAN/control");
 }
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.