Bring various .distfiles up to date and merge any extra completions onto 4.2 branch.

5 files changed, 112 insertions, 7 deletions

diff --git a/Completion/Debian/Command/.distfiles b/Completion/Debian/Command/.distfiles
index d1fbaf745..cabcdd3d8 100644
--- a/Completion/Debian/Command/.distfiles
+++ b/Completion/Debian/Command/.distfiles
@@ -1,10 +1,18 @@
 DISTFILES_SRC='
 .distfiles
-_apt               _bts _dpkg         _update-alternatives
-_aptitude          _bug _dpkg_source  _update-rc.d
-_apt-move          _debchange   _dput
-_apt-show-versions  _debfoster  _dupload
-_auto-apt          _debsign     _lintian _make-kpkg _wajig
-_dchroot _dlocate _dpkg-cross _madison _module-assistant
-_piuparts _toolchain-source
+_a2utils            _dak          _dpkg_source       _piuparts
+_apt                _dchroot      _dput              _reprepro
+_apt-file           _dchroot-dsa  _dupload           _schroot
+_aptitude           _debchange    _invoke-rc.d       _toolchain-source
+_apt-move           _debdiff      _linda             _update-alternatives
+_apt-show-versions  _debfoster    _lintian           _update-rc.d
+_auto-apt           _debsign      _madison           _uscan
+_bts                _dlocate      _make-kpkg         _wajig
+_bug                _dpkg         _mergechanges      _wanna-build
+_cdbs-edit-patch    _dpkg-cross   _module-assistant
+_dpatch-edit-patch
+_dpkg-buildpackage
+_dpkg-repack
+_lighttpd
+_svn-buildpackage
 '
diff --git a/Completion/Debian/Command/_debdiff b/Completion/Debian/Command/_debdiff
new file mode 100644
index 000000000..de7b9b9c8
--- /dev/null
+++ b/Completion/Debian/Command/_debdiff
@@ -0,0 +1,22 @@
+#compdef debdiff
+
+_arguments \
+  '(-d --dirs)'{-d,--dirs}'[do not ignore directories]' \
+  '--nodirs[ignore directories]' \
+  '(-m --move)'{-m,--move}':movement:_files' \
+  '--move-regex:movement:_files' \
+  '--nocontrol[do not compare control files]' \
+  '--control[compare control files]' \
+  '--wp[pass -p to wdiff]' \
+  '--wl[pass -l to wdiff]' \
+  '--wt[pass -t to wdiff]' \
+  '--show-moved[show movements between packages]' \
+  '--noshow-moved[do not show movements between packages]' \
+  '--renamed:package:_deb_packages avail' \
+  '(--no-conf --noconf)'{--no-conf,--noconf}'[do not read any config files]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '(-v --version)'{-v,--version}'[show version]' \
+  '(-q --quiet)'{-q,--quiet}'[be quiet if no differences]' \
+  '--from:debs:_files -g "*.deb"' \
+  '--to:debs:_files -g "*.deb"' \
+  '*:file to compare:_files -g "*.(deb|changes|dsc)"'
diff --git a/Completion/Debian/Command/_linda b/Completion/Debian/Command/_linda
new file mode 100644
index 000000000..d428d18a8
--- /dev/null
+++ b/Completion/Debian/Command/_linda
@@ -0,0 +1,26 @@
+#compdef linda
+
+_arguments \
+  '(-c --config)'{-c,--config=}':config file:_files' \
+  '(-C --checks)'{-C,--checks=}':check regexes:' \
+  '(-d --debug)*'{-d,--debug}'[debug]' \
+  '(-D --disable-local)*'{-D,--disable-local}'[disable registration of local checks]' \
+  '(-f --format)'{-f,--format=}':output format:(branden long lintian figlet)' \
+  '(-h --help)'{-h,--help}'[help]' \
+  '(-i --info)'{-i,--info}'[info]' \
+  '(-l --lab)'{-l,--lab=}':lab root:_files -/' \
+  '(-L --list-checks)'{-L,--list-checks=}':list checks:' \
+  '(-m --more-overrides)'{-m,--more-overrides=}':more overrides:' \
+  '(-n --no-cull)'{-n,--no-cull}'[do not delete lab after completion]' \
+  '(-o --show-overridden)'{-o,--show-overridden}'[display errors that are overridden]' \
+  '(-p --print-overrides)'{-p,--print-overrides}'[print parsed overrides]' \
+  '(-P --profiling)'{-P,--profiling}'[print profiling stats]' \
+  '(-q --quiet)'{-q,--quiet}'[quiet]' \
+  '(-s --show-tag)'{-s,--show-tag}'[print tag along with errors]' \
+  '(-S --seteuid)'{-S,--seteuid}'[do not seteuid to nobody]' \
+  '(-t --types)'{-t,--types=}':types string:_values -s , "types" Error Warning eXperimental Informational' \
+  '(-T --traceback)'{-T,--traceback}'[show a traceback from any exception]' \
+  '(-U --unpack)'{-U,--unpack}':unpack level:' \
+  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '(-V --version)'{-V,--version}'[version]' \
+  ':package:_files -g "*.(changes|u#deb|dsc)"'
diff --git a/Completion/Debian/Command/_mergechanges b/Completion/Debian/Command/_mergechanges
new file mode 100644
index 000000000..607fdacb0
--- /dev/null
+++ b/Completion/Debian/Command/_mergechanges
@@ -0,0 +1,5 @@
+#compdef mergechanges
+
+_arguments \
+  '-f[output to file]' \
+  '*:changes file:_files -g "*.changes(-.)"'
diff --git a/Completion/Debian/Command/_wanna-build b/Completion/Debian/Command/_wanna-build
new file mode 100644
index 000000000..779906afb
--- /dev/null
+++ b/Completion/Debian/Command/_wanna-build
@@ -0,0 +1,44 @@
+#compdef wanna-build
+
+_arguments \
+  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '--take[take package for building]' \
+  '(-f --failed)'{-f,--failed}'[record as failed]' \
+  '(-u --uploaded)'{-u,--uploaded}'[record as uploaded]' \
+  '(-n --no-build)'{-n,--no-build}'[record as undesired]' \
+  '--dep-wait[record as waiting for source dependencies]' \
+  '--merge-quinn[merge quinn-diff output into database]' \
+  '--merge-partial-quinn[merge partial quinn-diff output into database]' \
+  '--merge-packages[merge Packages files into database]' \
+  '--merge-sources[merge Sources files into database]' \
+  '--merge-all' \
+  '--pretend-avail[pretend that given packages are available now]' \
+  '(-i --info)'{-i,--info=}':source package:_deb_packages avail' \
+  '(-l --list)'{-l,--list=}':state:(needs-build building uploaded failed installed dep-wait not-for-us all failed-removed dep-wait-removed install-wait reupload-wait)' \
+  '(-m --message)'{-m,--message=}':message:' \
+  '(-o --override)'{-o,--override}"[override another user's lock]" \
+  '(-U --user)'{-U,--user=}':user name:' \
+  '--import:ASCII file:_files' \
+  '--export:ASCII file:_files' \
+  '--create-db[create database]' \
+  '--correct-compare' \
+  '(-N --no-propagation)'{-N,--no-propagation} \
+  '(-D --no-down-propagation)'{-D,--no-down-propagation} \
+  '--give-back[give package back]' \
+  '--forget' \
+  '--forget-user' \
+  '--binNMU:version:' \
+  '--perm-build-priority:priority:' \
+  '--build-priority:priority:' \
+  '(-d --dist)'{-d,--dist=}':distribution:(stable testing unstable all)' \
+  '(-O --order)'{-O,--order=}':ordering:(P S p s n c b)' \
+  '(-b --database)'{-b,--database=}':database:' \
+  '(-A --arch)'{-A,--arch=}':architecture:' \
+  '(-c --category)'{-c,--category=}':category:(uploaded-fixed-pkg fix-expected reminder-sent nmu-offered easy medium hard compiler-error none)' \
+  '(-a --min-age)'{-a,--min-age=}':minimum age:' \
+  '--max-age:maximum age:' \
+  '--manual-edit' \
+  '--maintlock-create' \
+  '--maintlock-remove' \
+  '--clean-db' \
+  ':package_version:_deb_packages avail'