r472: * Fixed issues with extended parameters to dh_gencontrol including spaces

     and quotes. This was some histirical cruft that deals with splitting up
     the string specified by -u, and it should not have applied to the set
     of options after --. Now that it's fixed, any and all programs that
     support a -- and options after it, do not require any special quoting
     of the succeeding options. Quote just like you would in whatever
     program those options go to. So, for example,
     dh_gencontrol -Vblah:Depends='foo, bar (>= 1.2)' will work just as you
     would hope. This fix does NOT apply to -u; don't use -u if you must do
     something complex. Closes: #89311
   * Made escape_shell output a lot better.

1 files changed, 3 insertions, 2 deletions

diff --git a/dh_gencontrol b/dh_gencontrol
index d1fdd943..bb39780c 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -52,9 +52,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
 	}
 
-	# Generate and install control file.
+	# Generate and install control file. Use complex_doit to allow for
+	# wild and wonderful U_PARAMS quoting.
 	doit("dpkg-gencontrol","-l$changelog","-isp","-p$package",
-		"-Tdebian/${ext}substvars","-P$tmp",@{$dh{U_PARAMS}});
+		     "-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");