[debhelper-devel] [PATCH] Put extra options after dh-generated ones

[KAction at gnu.org]

From: Dmitry Bogatov <KAction at gnu.org>

Put options added by `add_command_options` for dh_* commands *after*
ones, passed by dh(1) itself, e.g -O--buildsystem=haskell.

This change solve following issue with dh_shlibdeps(1), which allow
to pass raw arguments to underlying dpkg-shlibdeps(1) after `--`
argument. However, in presence of dh(1) generated arguments,
after following lines in Sequence file:

	add_command_options('dh_shlibdeps', '--', '-xlibgmp10')

dh(1) ends with following invocation:

$ dh_shlibdeps -- -xlibgmp10 -O--buildsystem=haskell

Note, that this way -O option is passed to dpkg-shlibdeps(1) and it is
not what it should to do.

With this patch, invocation of dh_shlibdeps(1) looks like:

$ dh_shlibdeps -O--buildsystem=haskell -- -xlibgmp10

and -O option is processed by dh_shlibdeps.
---
 dh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dh b/dh
index 4cba226..c48fb78 100755
--- a/dh
+++ b/dh
@@ -720,7 +720,7 @@ sub run {
 	my @options=@_;
 
 	# Include additional command options if any
-	unshift @options, @{$command_opts{$command}}
+	push @options, @{$command_opts{$command}}
 		if exists $command_opts{$command};
 
 	# 3 space indent lines the command being run up under the
-- 
I may be not subscribed. Please, keep me in carbon copy.