Merge tag 'debian/0.6.22' into bpo/wheezy

git-buildpackage Debian release 0.6.22

5 files changed, 168 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 638c09ae..e6eaf494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,114 @@
+git-buildpackage (0.6.22) unstable; urgency=medium
+
+  * [3d8939d] git.vfs: fix close method. Preventing a infinite recursion
+    which can be triggered by gbp pq export --commit.
+
+ -- Guido Günther <agx@sigxcpu.org>  Wed, 29 Oct 2014 07:47:21 +0100
+
+git-buildpackage (0.6.21) unstable; urgency=medium
+
+  * [81dab4b] pq: Don't fail commit if the series file is empty on the source
+    branch
+  * [740e431] man: fix option argument for --git-pbuilder-options
+  * [22a6987] Improve change reporting a bit
+  * [e08d64d] Complete setup.py for pypi
+
+ -- Guido Günther <agx@sigxcpu.org>  Fri, 17 Oct 2014 18:41:14 +0200
+
+git-buildpackage (0.6.20) unstable; urgency=medium
+
+  * [ee44479] Allow to always drop pq branch after export (Closes: #761160)
+  * [51ac0a5] pq: document --drop
+  * [90b283f] meta-closes: Move help text to GbpOptionParser.help
+  * [0afcd3d] pq: Add "pq export --commit" option.  This commits the changes
+    in the pq right away. This options is currently experimental and subject
+    to change.
+
+ -- Guido Günther <agx@sigxcpu.org>  Sun, 12 Oct 2014 11:42:27 +0200
+
+git-buildpackage (0.6.19) unstable; urgency=medium
+
+  * [5d4cb92] Update to git-pbuilder 1.33
+
+ -- Guido Günther <agx@sigxcpu.org>  Sun, 07 Sep 2014 09:25:48 +0200
+
+git-buildpackage (0.6.18) unstable; urgency=medium
+
+  * Upload to unstable
+  * [6edd836] Don't delete *_source.changes on source only builds
+    (Closes: #758726)
+  * [a37832e] Mention --no-merge (Closes: #760091)
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 06 Sep 2014 13:41:05 +0200
+
+git-buildpackage (0.6.17) experimental; urgency=medium
+
+  [ Guido Günther ]
+  * [692e5da] Make sure we fixup the changelog trailer with newer devscripts.
+    We don't change any mainttrailer options already given.
+    Thanks to James McCoy for the detailed explanation (Closes: #740566)
+  * [ae5805e] Improve error messages on formatting errors to
+    make it easier for the user to detect misformated replacement strings in
+    config files and command line options.
+  * [5f82f44] gbp: add --version option (Closes: #758909)
+  * [04aa92f] Allow to list all available gbp subcommands
+  * [68c053f] Unify doc strings a bit since they now show up with --list-cmds
+  * [6d510ce] bash completion: make command list dynamic.
+    Use "gbp --list-cmds" so we don't have to hardcode the available
+    commands and get support for the RPM ones as they show up.
+
+  [ Kamal Mostafa ]
+  * [6823e51] buildpackage: Make debian-tag message configurable via
+    --git-debian-tag-msg.
+
+ -- Guido Günther <agx@sigxcpu.org>  Sun, 24 Aug 2014 11:31:28 +0200
+
+git-buildpackage (0.6.16) experimental; urgency=medium
+
+  [ Markus Lehtonen ]
+  * Doc cleanups and reformatting
+  * [736b9d8] Introduce git-import-srpm tool.
+  * [ed228a2] import-srpm: add 'vendor' config option.
+    Intended to represent the distribution vendor (e.g. 'Debian').
+    Currently, this can be used in tag format strings.
+
+  [ Guido Günther ]
+  * [0b1fc0d] buildpackage: Also print tag name when tagging the Debian
+    release.  Based on a patch by Kamal Mostafa
+  * [2bf944f] Pass --no-pristine-tar to SRPM compnent tests
+    to avoid pristine-tar showing up in the matched branches
+  * [23090c9] Introduce git-buildpackage-rpm. Currently only including "gbp
+    import-srpm".
+  * Remove newly introducted spurious log outputs from tests
+
+ -- Guido Günther <agx@sigxcpu.org>  Mon, 28 Jul 2014 15:57:49 +0200
+
+git-buildpackage (0.6.15) unstable; urgency=medium
+
+  * [5cde49a] Revert "Determine build_dir upfront"
+    This reverts commit b2549fac19f2d666552291a4fcf2020ca0570834.
+    Closes: #749104
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 24 May 2014 18:40:44 +0200
+
+git-buildpackage (0.6.14) unstable; urgency=medium
+
+  * [949ce84] Slightly improve usage output
+  * [045e607] gbp pq: document --force
+  * [817976e] Handle version format errors more gracefully.
+  * [b0390d1] Fix comitter vs committer typos.
+    Thanks to Sandro Tosi (Closes: #748339)
+  * [dc231f2] Document that the patches must apply without fuzz
+  * [de77df7] pq: Print proper error message if we fail to apply the tree
+  * [54e4542] pq: Try harder to cleanup after a failed patch.
+    Thanks to Marco d'Itri for the repo to debug this
+  * [b2549fa] Determine build_dir upfront
+  * [a050942] Improve error reporting on failed commands.
+    (Closes: #748248)
+  * [030ff96] Improve error reporting on hooks.
+
+ -- Guido Günther <agx@sigxcpu.org>  Thu, 22 May 2014 22:47:37 +0200
+
 git-buildpackage (0.6.13~bpo70+1) wheezy-backports; urgency=medium
 
   * Rebuild for wheezy-backports.
diff --git a/debian/control b/debian/control
index 712dcd41..7858f233 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,13 @@ Build-Depends:
  python-coverage,
  python-dateutil,
  python-epydoc,
+ python-mock,
  python-nose,
  python-nosexcover,
  python-pkg-resources,
+ python-rpm,
  python-setuptools,
+ rpm,
  sgml2x,
 # For the testsuite
  bzip2,
@@ -54,3 +57,17 @@ Description: Suite to help with Debian packages in Git repositories
   * gbp {pull,clone}: clone and pull from remote repos
   * gbp pq: manage debian/patches easily
   * gbp create-remote-repo: create remote repositories
+
+Package: git-buildpackage-rpm
+Architecture: all
+Depends: ${python:Depends},
+ ${misc:Depends},
+ git-buildpackage (= ${binary:Version}),
+ python-rpm,
+ rpm,
+Recommends: pristine-tar (>= 0.5)
+Suggests: python-notify, unzip
+Description: Suite to help with RPM packages in Git repositories
+ This package contains the following tools:
+  * gbp import-srpm: import existing RPM source packages into a git
+    repository
diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
new file mode 100644
index 00000000..67c03097
--- /dev/null
+++ b/debian/git-buildpackage-rpm.install
@@ -0,0 +1,2 @@
+usr/lib/python2.?/dist-packages/gbp/rpm/
+usr/lib/python2.7/dist-packages/gbp/scripts/import_srpm.py
diff --git a/debian/git-buildpackage.bash-completion b/debian/git-buildpackage.bash-completion
index c0127041..053b9332 100644
--- a/debian/git-buildpackage.bash-completion
+++ b/debian/git-buildpackage.bash-completion
@@ -27,6 +27,12 @@ _gbp_options ()
 }
 
 
+_gbp_commands ()
+{
+    gbp --list-cmds | sed -ne  's/^ \+\([a-z\-]\+\) \-.*/\1/p'
+}
+
+
 _gbp_comp ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
@@ -208,15 +214,7 @@ have gbp &&
 _gbp ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
-    local commands="buildpackage       \
-                    clone              \
-                    create-remote-repo \
-                    dch                \
-                    import-dsc         \
-                    import-dscs        \
-                    import-orig        \
-                    pq                 \
-                    pull"
+    local commands=$(_gbp_commands)
     local func
 
     command=$(_gbp_find_cmd_on_cmdline "$commands")
diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
new file mode 100644
index 00000000..1a25e1dc
--- /dev/null
+++ b/debian/git-buildpackage.install
@@ -0,0 +1,31 @@
+usr/bin/
+usr/lib/python2.?/dist-packages/gbp-*
+usr/lib/python2.?/dist-packages/gbp/command_wrappers.py
+usr/lib/python2.?/dist-packages/gbp/config.py
+usr/lib/python2.?/dist-packages/gbp/dch.py
+usr/lib/python2.?/dist-packages/gbp/deb/
+usr/lib/python2.?/dist-packages/gbp/errors.py
+usr/lib/python2.?/dist-packages/gbp/format.py
+usr/lib/python2.?/dist-packages/gbp/git/
+usr/lib/python2.?/dist-packages/gbp/__init__.py
+usr/lib/python2.?/dist-packages/gbp/log.py
+usr/lib/python2.?/dist-packages/gbp/notifications.py
+usr/lib/python2.?/dist-packages/gbp/patch_series.py
+usr/lib/python2.?/dist-packages/gbp/pkg/
+usr/lib/python2.?/dist-packages/gbp/scripts/buildpackage.py
+usr/lib/python2.?/dist-packages/gbp/scripts/clone.py
+usr/lib/python2.?/dist-packages/gbp/scripts/common/
+usr/lib/python2.?/dist-packages/gbp/scripts/config.py
+usr/lib/python2.?/dist-packages/gbp/scripts/create_remote_repo.py
+usr/lib/python2.?/dist-packages/gbp/scripts/dch.py
+usr/lib/python2.?/dist-packages/gbp/scripts/import_dsc.py
+usr/lib/python2.?/dist-packages/gbp/scripts/import_dscs.py
+usr/lib/python2.?/dist-packages/gbp/scripts/import_orig.py
+usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py
+usr/lib/python2.?/dist-packages/gbp/scripts/pq.py
+usr/lib/python2.?/dist-packages/gbp/scripts/pull.py
+usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
+usr/lib/python2.?/dist-packages/gbp/tmpfile.py
+usr/lib/python2.?/dist-packages/gbp/tristate.py
+usr/lib/python2.?/dist-packages/gbp/version.py
+etc/git-buildpackage/gbp.conf