unposted: add new options, fix thinkos for reportbug completion

1 files changed, 19 insertions, 8 deletions

diff --git a/Completion/Debian/_bug b/Completion/Debian/_bug
index d25b84c52..1c67103e0 100644
--- a/Completion/Debian/_bug
+++ b/Completion/Debian/_bug
@@ -1,11 +1,10 @@
-#compdef bug reportbug
+#compdef bug reportbug querybts
 
 local _bug_commonargs _rb_commonargs
 
 _bug_commonargs=('-d[debug: send mail to postmaster@localhost]' \
            '-m[maintainer-only]' \
            '-p[print to stdout instead of mail]' \
-           '-q[quiet - no e-mail forwarding]' \
            '-h[help]' \
            '-v[version]' \
            '*:package:_deb_packages installed')
@@ -24,6 +23,8 @@ bug)
 _arguments '-c[exclude configs from report]' \
            '-f[argument is a file, not a package]' \
            '-H[special header]:custom header:' \
+           '-p[print to stdout instead of mail]' \
+           '-q[quiet - no e-mail forwarding]' \
            '-s[set subject]:subject:' \
            '-S[set severity]:severity:(wishlist normal important grave critical)' \
            '-x[do not cc submitter]' \
@@ -35,7 +36,7 @@ reportbug)
 _arguments '(--no-config-files)-c[exclude configs from report]' \
            '(-c)--no-config-files' \
            '(--file)-f[argument is a file, not a package]:filename:' \
-           '(-f)--file=:filename:' \
+           '(-f)--file=:filename:_files' \
            '(--header)-H[special header]:custom header:' \
            '(-H)--header=:custom header:' \
            '(--subject)-s[set subject]:subject:' \
@@ -50,19 +51,29 @@ _arguments '(--no-config-files)-c[exclude configs from report]' \
            '(-a)--af[use af instead of editor]' \
            '(--no-bts-query)-b[do not check bts]' \
            '(-b)--no-bts-query' \
-           '-g[sign report with GnuPG]' \
-           '(--include)-i[include text]:_files' \
-           '(-i)--include=:_files' \
+           '(--gnupg)-g[sign report with GnuPG]' \
+           '(-g)--gnupg[sign report with GnuPG]' \
+           '(--include)-i[include text]:include file:_files' \
+           '(-i)--include=:include file:_files' \
            '(--mutt)-M[use mutt instead of editor]' \
            '(-M)--mutt' \
            '--mua=[use specified mua instead of editor]' \
            '(--nmh --mh)-n[use comp instead of editor]' \
            '(-n --mh)--nmh' \
            '(--nmh -n)--mh' \
-           '(--output)-o[output to file instead of mail]' \
-           '(-o)--output=' \
+           '(--output)-o[output to file instead of mail]:output file:_files' \
+           '(-o)--output=:output file:_files' \
            '(--pgp)-P[sign report with PGP]' \
            '(-P)--pgp' \
+           '--realname=' \
+           '(--replyto)--reply-to=' \
+           '(--reply-to)--replyto=' \
+           '(--print)-p[print to stdout instead of mail]' \
+           '(-p)--print' \
+           '(--quiet)-q[quiet - no e-mail forwarding]' \
+           '(-q)--quiet' \
+           '(--query-only)-Q[do not submit]' \
+           '(-Q)--query-only' \
            "$_bug_commonargs[@]" \
 	   "$_rb_commonargs[@]"
 ;;