The following commit has been merged in the master branch:
commit 6df36499a7aaf3edbb0c39368d459b4b36fe71e0
Author: Ville Skyttä <[email protected]>
Date:   Mon May 25 23:03:08 2009 +0300

    Split reportbug and querybts completions to contrib/reportbug.

diff --git a/CHANGES b/CHANGES
index 202c791..6bcbba8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -52,6 +52,7 @@ bash-completion (1.x)
   * Improve postfix completion.
   * Improve samba completion.
   * Split lilo completion to contrib/lilo.
+  * Split reportbug and querybts completions to contrib/reportbug.
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/Makefile.am b/Makefile.am
index 5f367a7..5cf540a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ bashcomp_DATA = contrib/ant \
                contrib/quota-tools \
                contrib/rdesktop \
                contrib/repomanage \
+               contrib/reportbug \
                contrib/ri \
                contrib/rpcdebug \
                contrib/rpmcheck \
diff --git a/bash_completion b/bash_completion
index eeeece6..2cd6b6e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -3727,126 +3727,6 @@ _configure_func()
 }
 complete -F _configure_func $default configure
 
-# Debian reportbug(1) completion
-#
-have reportbug &&
-_reportbug()
-{
-       local cur prev
-
-       COMPREPLY=()
-       cur=`_get_cword`
-       prev=${COMP_WORDS[COMP_CWORD-1]}
-
-       case "$prev" in
-           -f|--filename|-i|--include|--mta|-o|--output)
-               _filedir
-               return 0
-               ;;
-           -B|--bts)
-               COMPREPLY=( $( compgen -W "debian guug kde mandrake help" -- \
-                              $cur ))
-               return 0
-               ;;
-           -e|--editor|--mua)
-               COMP_WORDS=(COMP_WORDS[0] $cur)
-               COMP_CWORD=1
-               _command
-               return 0
-               ;;
-           --mode)
-               COMPREPLY=( $( compgen -W "novice standard expert" -- $cur ) )
-               return 0
-               ;;
-           -S|--severity)
-               COMPREPLY=( $( compgen -W "grave serious important normal \
-                                          minor wishlist" -- $cur ) )
-               return 0
-               ;;
-           -u|--ui|--interface)
-               COMPREPLY=( $( compgen -W "newt text gnome" -- $cur ) )
-               return 0
-               ;;
-           -t|--type)
-               COMPREPLY=( $( compgen -W "gnats debbugs" -- $cur ) )
-               return 0
-               ;;
-           -T|--tags)
-               COMPREPLY=( $( compgen -W "none \
-                                          woody potato sarge sarge-ignore etch 
etch-ignore \
-                                          lenny lenny-ignore sid experimental 
confirmed \
-                                          d-i fixed fixed-in-experimental 
fixed-upstream \
-                                          help l10n moreinfo patch pending 
security \
-                                          unreproducible upstream wontfix ipv6 
lfs" -- $cur ))
-               return 0
-               ;;
-           *)
-               ;;
-       esac
-
-       COMPREPLY=($( compgen -W '-h --help -v --version -a --af -b \
-                       --no-query-bts --query-bts -B --bts -c --configure \
-                       --no-config-files --check-available -d --debug \
-                       --no-check-available -e --editor --email -f \
-                       --filename -g --gnupg -H --header -i --include -j \
-                       --justification -l --ldap --no-ldap -L --list-cc -m \
-                       --maintonly --mode --mua --mta --mutt -n --mh --nmh \
-                       -o --output -p --print -P --pgp --proxy --http_proxy\
-                       -q --quiet -Q --query-only --realname --report-quiet \
-                       --reply-to --replyto -s --subject -S --severity \
-                       --smtphost -t --type -T --tags --template -V -x \
-                       --no-cc --package-version -z --no-compress \
-                       --ui --interface -u \
-                       wnpp boot-floppies kernel bugs.debian.org \
-                       cdimage.debian.org general installation-reports \
-                       listarchives lists.debian.org mirrors nm.debian.org \
-                       press project qa.debian.org release-notes \
-                       security.debian.org tech-ctte upgrade-reports \
-                       www.debian.org' -- $cur ) \
-                       $( apt-cache pkgnames -- $cur 2> /dev/null) )
-       _filedir
-       return 0
-} &&
-complete -F _reportbug $filenames reportbug
-
-# Debian querybts(1) completion
-#
-have querybts &&
-_querybts()
-{
-       local cur prev
-
-       COMPREPLY=()
-       cur=`_get_cword`
-       prev=${COMP_WORDS[COMP_CWORD-1]}
-
-       case "$prev" in
-           -B|--bts)
-               COMPREPLY=( $( compgen -W "debian guug kde mandrake help" -- \
-                              $cur ))
-               return 0
-               ;;
-           -u|--ui|--interface)
-               COMPREPLY=($( compgen -W "newt text gnome" -- $cur ))
-               return 0
-               ;;
-           *)
-               ;;
-       esac
-
-       COMPREPLY=($( compgen -W '-h --help -v --version -A --archive \
-                       -B --bts -l --ldap --no-ldap --proxy= --http_proxy= \
-                       -s --source -w --web -u --ui --interface \
-                       wnpp boot-floppies kernel bugs.debian.org \
-                       cdimage.debian.org general installation-reports \
-                       listarchives lists.debian.org mirrors nm.debian.org \
-                       press project qa.debian.org release-notes \
-                       security.debian.org tech-ctte upgrade-reports \
-                       www.debian.org' -- $cur ) \
-                       $( apt-cache pkgnames -- $cur 2> /dev/null) )
-} &&
-complete -F _querybts $filenames querybts
-
 # update-alternatives completion
 #
 have update-alternatives && {
diff --git a/contrib/reportbug b/contrib/reportbug
new file mode 100644
index 0000000..bee1ece
--- /dev/null
+++ b/contrib/reportbug
@@ -0,0 +1,120 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for (Debian) reportbug package
+
+have reportbug &&
+_reportbug()
+{
+       local cur prev
+
+       COMPREPLY=()
+       cur=`_get_cword`
+       prev=${COMP_WORDS[COMP_CWORD-1]}
+
+       case "$prev" in
+           -f|--filename|-i|--include|--mta|-o|--output)
+               _filedir
+               return 0
+               ;;
+           -B|--bts)
+               COMPREPLY=( $( compgen -W "debian guug kde mandrake help" -- \
+                              $cur ))
+               return 0
+               ;;
+           -e|--editor|--mua)
+               COMP_WORDS=(COMP_WORDS[0] $cur)
+               COMP_CWORD=1
+               _command
+               return 0
+               ;;
+           --mode)
+               COMPREPLY=( $( compgen -W "novice standard expert" -- $cur ) )
+               return 0
+               ;;
+           -S|--severity)
+               COMPREPLY=( $( compgen -W "grave serious important normal \
+                                          minor wishlist" -- $cur ) )
+               return 0
+               ;;
+           -u|--ui|--interface)
+               COMPREPLY=( $( compgen -W "newt text gnome" -- $cur ) )
+               return 0
+               ;;
+           -t|--type)
+               COMPREPLY=( $( compgen -W "gnats debbugs" -- $cur ) )
+               return 0
+               ;;
+           -T|--tags)
+               COMPREPLY=( $( compgen -W "none \
+                                          woody potato sarge sarge-ignore etch 
etch-ignore \
+                                          lenny lenny-ignore sid experimental 
confirmed \
+                                          d-i fixed fixed-in-experimental 
fixed-upstream \
+                                          help l10n moreinfo patch pending 
security \
+                                          unreproducible upstream wontfix ipv6 
lfs" -- $cur ))
+               return 0
+               ;;
+           *)
+               ;;
+       esac
+
+       COMPREPLY=($( compgen -W '-h --help -v --version -a --af -b \
+                       --no-query-bts --query-bts -B --bts -c --configure \
+                       --no-config-files --check-available -d --debug \
+                       --no-check-available -e --editor --email -f \
+                       --filename -g --gnupg -H --header -i --include -j \
+                       --justification -l --ldap --no-ldap -L --list-cc -m \
+                       --maintonly --mode --mua --mta --mutt -n --mh --nmh \
+                       -o --output -p --print -P --pgp --proxy --http_proxy\
+                       -q --quiet -Q --query-only --realname --report-quiet \
+                       --reply-to --replyto -s --subject -S --severity \
+                       --smtphost -t --type -T --tags --template -V -x \
+                       --no-cc --package-version -z --no-compress \
+                       --ui --interface -u \
+                       wnpp boot-floppies kernel bugs.debian.org \
+                       cdimage.debian.org general installation-reports \
+                       listarchives lists.debian.org mirrors nm.debian.org \
+                       press project qa.debian.org release-notes \
+                       security.debian.org tech-ctte upgrade-reports \
+                       www.debian.org' -- $cur ) \
+                       $( apt-cache pkgnames -- $cur 2> /dev/null) )
+       _filedir
+       return 0
+} &&
+complete -F _reportbug $filenames reportbug
+
+have querybts &&
+_querybts()
+{
+       local cur prev
+
+       COMPREPLY=()
+       cur=`_get_cword`
+       prev=${COMP_WORDS[COMP_CWORD-1]}
+
+       case "$prev" in
+           -B|--bts)
+               COMPREPLY=( $( compgen -W "debian guug kde mandrake help" -- \
+                              $cur ))
+               return 0
+               ;;
+           -u|--ui|--interface)
+               COMPREPLY=($( compgen -W "newt text gnome" -- $cur ))
+               return 0
+               ;;
+           *)
+               ;;
+       esac
+
+       COMPREPLY=($( compgen -W '-h --help -v --version -A --archive \
+                       -B --bts -l --ldap --no-ldap --proxy= --http_proxy= \
+                       -s --source -w --web -u --ui --interface \
+                       wnpp boot-floppies kernel bugs.debian.org \
+                       cdimage.debian.org general installation-reports \
+                       listarchives lists.debian.org mirrors nm.debian.org \
+                       press project qa.debian.org release-notes \
+                       security.debian.org tech-ctte upgrade-reports \
+                       www.debian.org' -- $cur ) \
+                       $( apt-cache pkgnames -- $cur 2> /dev/null) )
+} &&
+complete -F _querybts $filenames querybts

-- 
bash-completion

_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/bash-completion-commits

Reply via email to