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

[debhelper.git] / dh_gencontrol

diff --git a/dh_gencontrol b/dh_gencontrol
index d305b961c54b7fc0750cc946d4f82c41f109ef07..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,21 +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". 
-
-Note that L<dpkg-gencontrol(1)> expands certian substirution variables
-when generating the control file (for details, see its man page). Those
-variables are typically generated by L<dh_shlibdeps(1)> and like programs.
-However, if you want to specify some of your own manually, you may do so,
-by creating files named debian/package.substvars (where package is the
-package these variables apply to). The files should be of the same form
-output by L<dpkg-shlibdeps(1)>
+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>
 
@@ -60,28 +52,27 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
        }
 
-       # Merge in user-specified substvars file with debhelper generated
-       # one.
-       my $substvars=pkgfile($package,"substvars");
-       if (-e $substvars) {
-               complex_doit("cat $substvars >> debian/${ext}substvars.debhelper");
-       }
-
        # Generate and install control file.
-       doit("dpkg-gencontrol","-l$changelog","-isp","-p$package",
-                    "-Tdebian/${ext}substvars.debhelper",
-                    "-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.