X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_gencontrol;h=93f0459411dc1bb448ad171ed4db095677904328;hb=62ece7f4459ec9f924aa73427b7a9f3246cea34e;hp=08fb680a15c9fd206f895a0c060876fb0428aa44;hpb=73a6f7412a85594660bcd0e8c83efdec794468fa;p=debhelper.git

diff --git a/dh_gencontrol b/dh_gencontrol
index 08fb680..93f0459 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -27,21 +27,28 @@ useful flags.
 
 =over 4
 
-=item B<-u>I<params>, B<--dpkg-gencontrol-params>=I<params>
-
 =item B<--> I<params>
 
 Pass "params" to L<dpkg-gencontrol(1)>.
 
+=item B<-u>I<params>, B<--dpkg-gencontrol-params>=I<params>
+
+This is another way to pass I<params> to L<dpkg-deb(1)>.
+It is deprecated; use B<--> instead.
+
 =back
 
 =cut
 
-init();
+init(options => {
+	"dpkg-gencontrol-params=s", => \$dh{U_PARAMS},
+});
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $ext=pkgext($package);
+
+	my $substvars="debian/${ext}substvars";
 	
 	my $changelog=pkgfile($package,'changelog');
 	if (! $changelog) {
@@ -52,15 +59,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
 	}
 
+	# avoid gratuitous warning
+	if (! -e $substvars || system("grep -q '^misc:Depends=' $substvars") != 0) {
+		complex_doit("echo misc:Depends= >> $substvars");
+	}
+	
 	# Generate and install control file.
 	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", 
+	doit(@command, "-l$changelog", "-T$substvars", 
 		"-P$tmp",@{$dh{U_PARAMS}});
 
 	# This chmod is only necessary if the user sets the umask to