Drop all gbp-* and git-* commands

as announced in the deprecation notice from June 2013.

1 files changed, 10 insertions, 31 deletions

diff --git a/debian/git-buildpackage.bash-completion b/debian/git-buildpackage.bash-completion
index 053b933..39701c8 100644
--- a/debian/git-buildpackage.bash-completion
+++ b/debian/git-buildpackage.bash-completion
@@ -23,7 +23,7 @@ _gbp_tags ()
 
 _gbp_options ()
 {
-    $1 --help | sed -ne  's/^ \+\(\(\-[a-z]\), \)\?\(\-\-[a-z\-]\+\=\?\).*/\2 \3/p'
+    gbp $1 --help | sed -ne  's/^ \+\(\(\-[a-z]\), \)\?\(\-\-[a-z\-]\+\=\?\).*/\2 \3/p'
 }
 
 
@@ -99,10 +99,9 @@ _gbp_find_cmd_on_cmdline ()
     done
 }
 
-have git-buildpackage &&
 _gbp_buildpackage()
 {
-    local options=$(_gbp_options git-buildpackage)
+    local options=$(_gbp_options buildpackage)
     local branch_opts="--git-debian-branch\= --git-upstream-branch\= --git-upstream-tree\="
     local tag_opts="--git-debian-tag\= --git-upstream-tag\="
     local tristate_opts="--git-color\= --git-notify\="
@@ -111,104 +110,84 @@ _gbp_buildpackage()
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" \
               "$cbdist_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_buildpackage -o default git-buildpackage
 
-
-have git-dch &&
 _gbp_dch ()
 {
-    local options=$(_gbp_options git-dch)
+    local options=$(_gbp_options dch)
     local branch_opts="--debian-branch\="
     local tag_opts="--debian-tag\= --upstream-tag\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_dch -o default git-dch
-
 
-have git-import-orig &&
 _gbp_import_orig ()
 {
-    local options=$(_gbp_options git-import-orig)
+    local options=$(_gbp_options import-orig)
     local branch_opts="--debian-branch\= --upstream-branch\="
     local tag_opts="--debian-tag\= --upstream-tag\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_import_orig -o default git-import-orig
-
 
-have git-import-dsc &&
 _gbp_import_dsc ()
 {
-    local options=$(_gbp_options git-import-dsc)
+    local options=$(_gbp_options import-dsc)
     local branch_opts="--debian-branch\= --upstream-branch\="
     local tag_opts="--debian-tag\= --upstream-tag\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_import_dsc -o default git-import-dsc
 
-have git-import-dscs &&
 _gbp_import_dscs ()
 {
-    local options="$(_gbp_options git-import-dscs) $(_gbp_options git-import-dsc)"
+    local options="$(_gbp_options import-dscs) $(_gbp_options import-dsc)"
     local branch_opts="--debian-branch\= --upstream-branch\="
     local tag_opts="--debian-tag\= --upstream-tag\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_import_dscs -o default git-import-dscs
 
-have gbp-pq &&
 _gbp_pq ()
 {
-    local options=$(_gbp_options gbp-pq)
+    local options=$(_gbp_options pq)
     options="$options export import rebase drop apply switch"
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "" "" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_pq -o default gbp-pq
 
-have gbp-pull &&
 _gbp_pull ()
 {
-    local options=$(_gbp_options gbp-pull)
+    local options=$(_gbp_options pull)
     local branch_opts="--debian-branch\= --upstream-branch\="
     local tag_opts="--debian-tag\= --upstream-tag\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_pull -o default gbp-pull
 
-have gbp-clone &&
 _gbp_clone ()
 {
-    local options=$(_gbp_options gbp-clone)
+    local options=$(_gbp_options clone)
     local branch_opts="--debian-branch\= --upstream-branch\="
     local tag_opts="--debian-tag\= --upstream-tag\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_clone -o default gbp-clone
 
-have gbp-create-remote-repo &&
 _gbp_create_remote_repo ()
 {
-    local options=$(_gbp_options gbp-create-remote-repo)
+    local options=$(_gbp_options create-remote-repo)
     local branch_opts="--debian-branch\= --upstream-branch\="
     local tristate_opts="--color\="
 
     _gbp_comp "$options" "$branch_opts" "" "$tristate_opts"
 }
-[ "${have:-}" ] && complete -F _gbp_create_remote_repo -o default gbp-create-remote-repo
 
 have gbp &&
 _gbp ()