Handle conflicts from git merge release-20160315release-20160411

3 files changed, 156 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index 545b7576..ee6ad668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,70 @@
-git-buildpackage (0.6.25-tizen20150721) unstable; urgency=low
-
-  * Upgrade version to 0.6.25-20150721
-
- -- SoonKyu Park <sk7.park@samsung.com>  Tue, 21 Jul 2015 15:23:00 +0900
-
-git-buildpackage (0.6.25) unstable; urgency=medium
+git-buildpackage (0.6.27-tizen20160302) unstable; urgency=medium
+
+  * Fix error logs when __import__ faild,like "No handlers could be found fo logger"
+  * Fix build problem on Debian 8
+
+ -- Jun Wang  <junbill.wangx@samsung.com>  Wed, 02 Mar 2016 07:47:21 +0100
+
+git-buildpackage (0.6.22-tizen20150206) unstable; urgency=low
+
+  * Rebase on top of upstream version 0.6.22
+  * Experimental support for BitBake
+    - Introduce import-bb tool.
+      This is the first tool in an effort of enabling gbp in the BitBake build
+      environment. Gbp-import-bb is a tool for importing packages from a
+      BitBake-based "combined" distro repository into individual per-package
+      Git repositories.
+    - Introduce pq-bb tool.
+      This is a tool for managing patch-queues for packages maintained in the
+      BitBake packaging format (.bb recipes).
+    - Introduce buildpackage-bb tool.
+      Initial version of the tool for building BitBake packages from Git.
+      NOTE: The buildpackage-bb tool itself is able to operate even without an
+      initialized BitBake build environment although the build likely fails in
+      this case. However, this makes it possible to export the packaging meta
+      data, for example.
+    - Introcude clone-bb tool.
+      This is a new tool for helping to clone remote per-package Git
+      repositories when working in BitBake-based "full distro" build
+      environment. This is useful in the case that individual packages are
+      actually maintained in per-package Git repositories (like Tizen). That
+      is, the full distro repository that the developer operates in is
+      composed of the packaging meta data from the individual per-package
+      repositories. When willing to contribute to a package the developer
+      would use clone-bb to clone the correct per-package repository and make
+      his changes there.
+      NOTE: clone-bb uses GBP_PACKAGING_REPO variable to determine the remote
+      repository URI. This variable should be defined in the package recipes
+      in order to make clone-bb usable.
+    - Introduce submit-bb tool.
+      This is a Tizen-specific tool for creating and pushing special submit
+      tags.
+  * pq-rpm: better error message
+  * buildpackage-rpm: look for remote upstream branches.
+    Consider remote branches, too, while looking for the upstream branch
+    when trying to guess if a package is native or not.
+  * rpm packaging changes
+    - enable CentOS 7.
+    - include python egg-info in -common.
+  * rpm: suppress stderr when unpacking src.rpm
+  * UpstreamSource: suppress stderr from tar in _determine_prefix()
+  * patchseries: strip numbering when guessing subject from filename
+  * Changes in logging
+    - don't propagate to ancestor loggers
+    - don't initialize handlers in GbpLogger init.
+      Better compatibility with 3rd party modules that have their own logging
+      initializations.
+  * Features/fixes in GitRepository
+    - GitRepository/__git_inout: correctly handle input error
+    - GitRepository.create_tag: add 'annotate' argument.
+      For forcing the creation of annotated tags. Causes the an editor to be
+      spawned if no message is given.
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Fri, 06 Feb 2015 10:36:26 +0200
 
   * Upgrade version to 0.6.25
 
- -- SoonKyu Park <sk7.park@samsung.com>  Tue, 21 Jul 2015 15:02:21 +0900
-
-git-buildpackage (0.6.15-tizen20150303) unstable; urgency=low
-
-  * Revert "buildpackage-rpm: always create tarball for native packages"
-    Fixes: DEVT-215
-  * debian packaging: fix rpm build deps for Ubuntu 14.10.
-    Dependencies of python-rpm got broken in Ubuntu 14.10 at the update to
-    rpm v4.11.2-3ubuntu0.1. This change is a work around for that.
-
- -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Tue, 03 Mar 2015 17:30:37 +0200
+ -- Rong Jinhui <jinhui.rong@samsung.com>  Thu, 04 Aug 2015 08:53:30 +0800
 
 git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
 
@@ -70,6 +116,90 @@ git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
   * rpm packaging: use macro for python binary
 
  -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Thu, 28 Aug 2014 11:40:05 +0300
+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
 
diff --git a/debian/control b/debian/control
index 856566a1..f8d1a808 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
  python-pkg-resources,
  python-setuptools,
  sgml2x,
+ librpm-tizen,
 # For rpm (epydoc)
  rpm-common,
  python-rpm
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")