tag 804492 + patch
thanks
The attached patch is the simplest, most simple minded (and the easiest
diff to read). It consists only of symbolic link declarations in
debian/links and modifications to scripts/*.bash_completion .
There are other ways of approaching this that would have less dependence
on the use of symbolic links. I certainly would suggest that this heavy
use of symbolic links should be transitional, but some use is neccessary
since the same code suffices for several commands. One approach would be
to prepare a 'bash-completion' directory as a build step which would
require changes to scripts/Makefile rather than debian/links but I think
that would be less transparent.
diff -Nru devscripts-2.15.9/debian/changelog devscripts-2.15.9+nmu1/debian/changelog
--- devscripts-2.15.9/debian/changelog 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/debian/changelog 2015-11-10 09:12:44.000000000 +0000
@@ -1,3 +1,14 @@
+devscripts (2.15.9+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fixed issues with current bash completion (Closes: #804492)
+ - Added links from bash completion script to appropriate command name
+ - Removed "have" mechanism from bash completion scripts
+ - Removed undefined "$filenames" from chdist bash completion script
+ - Added missing complete statement to bash completion script for debi
+
+ -- Nicholas Bamber <nicho...@periapt.co.uk> Mon, 09 Nov 2015 10:20:57 +0000
+
devscripts (2.15.9) unstable; urgency=medium
[ Joachim Breitner ]
diff -Nru devscripts-2.15.9/debian/links devscripts-2.15.9+nmu1/debian/links
--- devscripts-2.15.9/debian/links 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/debian/links 2015-11-10 09:06:55.000000000 +0000
@@ -11,3 +11,32 @@
/usr/share/man/fr/man1/debchange.1.gz /usr/share/man/fr/man1/dch.1.gz
/usr/share/man/fr/man1/pts-subscribe.1.gz /usr/share/man/fr/man1/pts-unsubscribe.1.gz
/usr/share/man/fr/man1/edit-patch.1.gz /usr/share/man/fr/man1/add-patch.1.gz
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/wnpp-alert
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/wnpp-check
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/mk-build-deps
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/rmadison
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/mass-bug
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/debsnap
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/dd-list
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/build-rdeps
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/who-uploads
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/transition-check
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/getbuildlog
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/dcontrol
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/grep-excuses
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/rc-alert
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/bts
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/whodepends
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/dget
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/pts-subscribe
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/debc
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/debi
+/usr/share/bash-completion/completions/devscripts.pkgnames /usr/share/bash-completion/completions/pts-unsubscribe
+/usr/share/bash-completion/completions/devscripts.chdist /usr/share/bash-completion/completions/chdist
+/usr/share/bash-completion/completions/devscripts.dcut /usr/share/bash-completion/completions/dcut
+/usr/share/bash-completion/completions/devscripts.debchange /usr/share/bash-completion/completions/debchange
+/usr/share/bash-completion/completions/devscripts.debchange /usr/share/bash-completion/completions/dch
+/usr/share/bash-completion/completions/devscripts.debsign /usr/share/bash-completion/completions/debsign
+/usr/share/bash-completion/completions/devscripts.mk-origtargz /usr/share/bash-completion/completions/mk-origtargz
+/usr/share/bash-completion/completions/devscripts.uscan /usr/share/bash-completion/completions/uscan
+/usr/share/bash-completion/completions/devscripts.uupdate /usr/share/bash-completion/completions/uupdate
diff -Nru devscripts-2.15.9/scripts/chdist.bash_completion devscripts-2.15.9+nmu1/scripts/chdist.bash_completion
--- devscripts-2.15.9/scripts/chdist.bash_completion 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/scripts/chdist.bash_completion 2015-11-09 10:25:14.000000000 +0000
@@ -1,4 +1,3 @@
-have chdist &&
_chdist ()
{
local cur=$2 prev=$3
@@ -47,6 +46,6 @@
}
-[ -n "${have:-}" ] && complete -F _chdist $filenames chdist
+complete -F _chdist chdist
diff -Nru devscripts-2.15.9/scripts/dcut.bash_completion devscripts-2.15.9+nmu1/scripts/dcut.bash_completion
--- devscripts-2.15.9/scripts/dcut.bash_completion 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/scripts/dcut.bash_completion 2015-11-09 10:25:41.000000000 +0000
@@ -1,4 +1,3 @@
-have dcut &&
_dcut()
{
local cur prev options commands
@@ -43,4 +42,4 @@
return 0
}
-[ "$have" ] && complete -F _dcut -o filenames dcut
+complete -F _dcut -o filenames dcut
diff -Nru devscripts-2.15.9/scripts/debchange.bash_completion devscripts-2.15.9+nmu1/scripts/debchange.bash_completion
--- devscripts-2.15.9/scripts/debchange.bash_completion 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/scripts/debchange.bash_completion 2015-11-09 10:26:14.000000000 +0000
@@ -1,4 +1,3 @@
-have debchange &&
_debchange()
{
local cur prev options
@@ -76,5 +75,5 @@
return 0
}
-[ "$have" ] && complete -F _debchange debchange
-[ "$have" ] && complete -F _debchange dch
+complete -F _debchange debchange
+complete -F _debchange dch
diff -Nru devscripts-2.15.9/scripts/debsign.bash_completion devscripts-2.15.9+nmu1/scripts/debsign.bash_completion
--- devscripts-2.15.9/scripts/debsign.bash_completion 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/scripts/debsign.bash_completion 2015-11-09 10:26:29.000000000 +0000
@@ -1,4 +1,3 @@
-have debsign &&
_debsign()
{
local cur prev options
@@ -27,4 +26,4 @@
return 0
}
-[ "$have" ] && complete -F _debsign -o filenames debsign
+complete -F _debsign -o filenames debsign
diff -Nru devscripts-2.15.9/scripts/pkgnames.bash_completion devscripts-2.15.9+nmu1/scripts/pkgnames.bash_completion
--- devscripts-2.15.9/scripts/pkgnames.bash_completion 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/scripts/pkgnames.bash_completion 2015-11-09 11:19:03.000000000 +0000
@@ -19,5 +19,6 @@
fi
return 0
}
-complete -F _pkg_names wnpp-alert wnpp-check mk-build-deps rmadison mass-bug debsnap dd-list build-rdeps who-uploads transition-check getbuildlog dcontrol grep-excuses rc-alert bts whodepends dget pts-subscribe debc pts-unsubscribe
+complete -F _pkg_names wnpp-alert wnpp-check mk-build-deps rmadison mass-bug debsnap dd-list build-rdeps who-uploads transition-check getbuildlog dcontrol grep-excuses rc-alert bts whodepends dget pts-subscribe pts-unsubscribe
complete -o dirnames -F _debc debc
+complete -o dirnames -F _debc debi
diff -Nru devscripts-2.15.9/scripts/uupdate.bash_completion devscripts-2.15.9+nmu1/scripts/uupdate.bash_completion
--- devscripts-2.15.9/scripts/uupdate.bash_completion 2015-10-06 02:00:34.000000000 +0100
+++ devscripts-2.15.9+nmu1/scripts/uupdate.bash_completion 2015-11-09 10:26:46.000000000 +0000
@@ -1,4 +1,3 @@
-have uupdate &&
_uupdate()
{
local cur prev options
@@ -29,4 +28,4 @@
return 0
}
-[ "$have" ] && complete -F _uupdate -o filenames uupdate
+complete -F _uupdate -o filenames uupdate
