diff options
author | Guido Günther <agx@sigxcpu.org> | 2015-02-17 08:46:41 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2015-02-17 21:03:02 +0100 |
commit | e3a86661177d1b4238f1671ea104b38bfbda6983 (patch) | |
tree | 48e6064feb2d5e6732e125c0b8938ad6982fb1cb | |
parent | 296796f5f2dd00079c0c85d34882074abff07f5e (diff) |
Drop all gbp-* and git-* commands
as announced in the deprecation notice from June 2013.
-rwxr-xr-x | bin/gbp-clone | 5 | ||||
-rwxr-xr-x | bin/gbp-create-remote-repo | 5 | ||||
-rwxr-xr-x | bin/gbp-pq | 5 | ||||
-rwxr-xr-x | bin/gbp-pull | 5 | ||||
-rwxr-xr-x | bin/git-buildpackage | 5 | ||||
-rwxr-xr-x | bin/git-dch | 5 | ||||
-rwxr-xr-x | bin/git-import-dsc | 5 | ||||
-rwxr-xr-x | bin/git-import-dscs | 5 | ||||
-rwxr-xr-x | bin/git-import-orig | 5 | ||||
-rw-r--r-- | debian/git-buildpackage.bash-completion | 41 | ||||
-rw-r--r-- | setup.py | 11 |
11 files changed, 11 insertions, 86 deletions
diff --git a/bin/gbp-clone b/bin/gbp-clone deleted file mode 100755 index 33e8226..0000000 --- a/bin/gbp-clone +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.clone import main - -sys.exit(main(sys.argv)) diff --git a/bin/gbp-create-remote-repo b/bin/gbp-create-remote-repo deleted file mode 100755 index 81ca8c1..0000000 --- a/bin/gbp-create-remote-repo +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.create_remote_repo import main - -sys.exit(main(sys.argv)) diff --git a/bin/gbp-pq b/bin/gbp-pq deleted file mode 100755 index 733be7b..0000000 --- a/bin/gbp-pq +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.pq import main - -sys.exit(main(sys.argv)) diff --git a/bin/gbp-pull b/bin/gbp-pull deleted file mode 100755 index 21c22c5..0000000 --- a/bin/gbp-pull +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.pull import main - -sys.exit(main(sys.argv)) diff --git a/bin/git-buildpackage b/bin/git-buildpackage deleted file mode 100755 index bc093ab..0000000 --- a/bin/git-buildpackage +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.buildpackage import main - -sys.exit(main(sys.argv)) diff --git a/bin/git-dch b/bin/git-dch deleted file mode 100755 index 68eacd9..0000000 --- a/bin/git-dch +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.dch import main - -sys.exit(main(sys.argv)) diff --git a/bin/git-import-dsc b/bin/git-import-dsc deleted file mode 100755 index fd6737a..0000000 --- a/bin/git-import-dsc +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.import_dsc import main - -sys.exit(main(sys.argv)) diff --git a/bin/git-import-dscs b/bin/git-import-dscs deleted file mode 100755 index cd0f880..0000000 --- a/bin/git-import-dscs +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.import_dscs import main - -sys.exit(main(sys.argv)) diff --git a/bin/git-import-orig b/bin/git-import-orig deleted file mode 100755 index 812e3ec..0000000 --- a/bin/git-import-orig +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/python -u -import sys -from gbp.scripts.import_orig import main - -sys.exit(main(sys.argv)) 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 () @@ -61,16 +61,7 @@ setup(name = "gbp", 'Topic :: Software Development :: Version Control :: Git', 'Operating System :: POSIX :: Linux', ], - scripts = [ 'bin/git-buildpackage', - 'bin/git-import-dsc', - 'bin/git-import-orig', - 'bin/git-dch', - 'bin/git-import-dscs', - 'bin/gbp-pq', - 'bin/gbp-pull', - 'bin/gbp-clone', - 'bin/gbp-create-remote-repo', - 'bin/git-pbuilder'], + scripts = ['bin/git-pbuilder'], packages = find_packages(exclude=['tests', 'tests.*']), data_files = [("/etc/git-buildpackage/", ["gbp.conf"]),], setup_requires=['nose>=0.11.1', 'coverage>=2.85', 'nosexcover>=1.0.7'] if \ |