Handle conflicts from git merge masterdevel_psk_20160727

Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1

6 files changed, 86 insertions, 91 deletions

diff --git a/debian/changelog b/debian/changelog
index bbd64edb..581544d6 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-buildpackage (0.7.4-tizen20160514) unstable; urgency=medium
+
+  * Keep same version number with upstream source code ,version 0.7.4
+
+ -- Jun Wang  <junbill.wangx@samsung.com>  Sat, 14 May 2016 17:12:00 +0800
+
 git-buildpackage (0.6.27-tizen20160302) unstable; urgency=medium
 
   * Fix error logs when __import__ faild,like "No handlers could be found fo logger"
@@ -62,6 +68,60 @@ git-buildpackage (0.6.22-tizen20150206) unstable; urgency=low
 
  -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Fri, 06 Feb 2015 10:36:26 +0200
 
+  * Upgrade version to 0.6.25
+
+ -- Rong Jinhui <jinhui.rong@samsung.com>  Thu, 04 Aug 2015 08:53:30 +0800
+
+git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
+
+  [ Markus Lehtonen ]
+  * Rebase on top of upstream version 0.6.15
+  * Changes in buildpackage-rpm
+    - new 'commitish' keyword for spec vcs tag
+    - notify: catch RuntimeError when importing pynotify
+    - fix exit code in case of GitRepositoryError
+    - always create tarball for native packages
+    - check submodules from the exported treeish
+    - fix crash when running prebuild hook
+    - always run cleaner hook
+    - add --git-no-build option
+    - don't crash on invalid vcs format strings
+    - add '--git-native' option
+    - remove some outdated/unnecessary exception handling
+    - get rid of prepare_export_dir()
+    - handle invalid keys in orig prefix
+    - internal refactoring and fixes
+  * Changes in rpm-ch
+    - implement --commit option
+    - implement --commit-msg option
+    - rpm-ch: implement --meta-bts option
+    - rpm.policy: don't allow leading whitespace in bts meta tags
+  * docs: manpages for the rpm tools
+  * Misc. fixes and features
+    - buildpackage: refactor tarball compression
+    - gbp-dch: fix handling of the '--meta' option
+    - import-orig-rpm: download tarball into parent directory
+    - GitRepository/has_submodules: add treeish argument
+    - tristate: implement __nonzero__() method
+  * Logging:
+    - don't automatically setup gbp-specific logger
+    - fix auto colorizing for custom streams
+  * Tests
+    - multiple fixes and additions in ComponentTestBase class
+    - testutils: add directories arg to ls_* functions
+    - add unit tests for buildpackage-rpm
+  * Packaging
+    - rpm-packaging: recommend/require unzip
+    - recommend/require zipmerge
+    - depend/recommend rpmbuild
+
+  [ Junchun Guan ]
+  * Add PKGBUILD to support arch linux
+
+  [ Li Jinjing ]
+  * 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
@@ -147,57 +207,6 @@ git-buildpackage (0.6.16) experimental; urgency=medium
 
  -- Guido Günther <agx@sigxcpu.org>  Mon, 28 Jul 2014 15:57:49 +0200
 
-git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
-
-  [ Markus Lehtonen ]
-  * Rebase on top of upstream version 0.6.15
-  * Changes in buildpackage-rpm
-    - new 'commitish' keyword for spec vcs tag
-    - notify: catch RuntimeError when importing pynotify
-    - fix exit code in case of GitRepositoryError
-    - always create tarball for native packages
-    - check submodules from the exported treeish
-    - fix crash when running prebuild hook
-    - always run cleaner hook
-    - add --git-no-build option
-    - don't crash on invalid vcs format strings
-    - add '--git-native' option
-    - remove some outdated/unnecessary exception handling
-    - get rid of prepare_export_dir()
-    - handle invalid keys in orig prefix
-    - internal refactoring and fixes
-  * Changes in rpm-ch
-    - implement --commit option
-    - implement --commit-msg option
-    - rpm-ch: implement --meta-bts option
-    - rpm.policy: don't allow leading whitespace in bts meta tags
-  * docs: manpages for the rpm tools
-  * Misc. fixes and features
-    - buildpackage: refactor tarball compression
-    - gbp-dch: fix handling of the '--meta' option
-    - import-orig-rpm: download tarball into parent directory
-    - GitRepository/has_submodules: add treeish argument
-    - tristate: implement __nonzero__() method
-  * Logging:
-    - don't automatically setup gbp-specific logger
-    - fix auto colorizing for custom streams
-  * Tests
-    - multiple fixes and additions in ComponentTestBase class
-    - testutils: add directories arg to ls_* functions
-    - add unit tests for buildpackage-rpm
-  * Packaging
-    - rpm-packaging: recommend/require unzip
-    - recommend/require zipmerge
-    - depend/recommend rpmbuild
-
-  [ Junchun Guan ]
-  * Add PKGBUILD to support arch linux
-
-  [ Li Jinjing ]
-  * 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.15) unstable; urgency=medium
 
   * [5cde49a] Revert "Determine build_dir upfront"
diff --git a/debian/control b/debian/control
index 3bae3887..e5c828c9 100755
--- a/debian/control
+++ b/debian/control
@@ -12,16 +12,13 @@ Build-Depends:
  pychecker,
  python (>> 2.6.6-3~),
  python-epydoc,
- python-mock,
  python-nose,
  python-pkg-resources,
- python-rpm,
  python-setuptools,
- rpm,
  sgml2x,
  librpm-tizen,
 # For rpm (epydoc)
- rpm-common,
+ python-rpm
 Standards-Version: 3.9.4
 Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git
 Vcs-Browser: https://honk.sigxcpu.org/gitweb/?p=git-buildpackage.git
@@ -67,13 +64,13 @@ Architecture: all
 Depends: ${python:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
- git-buildpackage-common (= ${binary:Version}),
  python-rpm,
- rpm-common,
- rpm2cpio,Recommends: rpm
+ rpm2cpio,
+ git-buildpackage-common (= ${binary:Version})
+Recommends: rpm
 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
+  * git-import-srpm: import existing rpm source packages into a git
     repository
   * git-import-orig-rpm: import a new upstream version into the git repository
   * git-buildpackage-rpm: build a package out of a git repository, check for local
diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install
index 722eab68..5283d546 100644
--- a/debian/git-buildpackage-common.install
+++ b/debian/git-buildpackage-common.install
@@ -1,24 +1,13 @@
 usr/bin/gbp
 usr/bin/gbp-clone
 usr/bin/gbp-pull
-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/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/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/__init__.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
+usr/lib/python*/dist-packages/gbp/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/__init__.py*
+usr/lib/python*/dist-packages/gbp/scripts/clone.py*
+usr/lib/python*/dist-packages/gbp/scripts/config.py*
+usr/lib/python*/dist-packages/gbp/scripts/pull.py*
+usr/lib/python*/dist-packages/gbp/scripts/supercommand.py*
+usr/lib/python*/dist-packages/gbp/scripts/common/*.py*
+usr/lib/python*/dist-packages/gbp/git/*.py*
+usr/lib/python*/dist-packages/gbp/pkg/*.py*
 etc/git-buildpackage/gbp.conf
diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
index f243ebb9..8c49491e 100644
--- a/debian/git-buildpackage-rpm.install
+++ b/debian/git-buildpackage-rpm.install
@@ -1,2 +1,3 @@
-usr/lib/python2.?/dist-packages/gbp/rpm/
-usr/lib/python2.?/dist-packages/gbp/scripts/*rpm*.py*
+usr/bin/*rpm*
+usr/lib/python*/dist-packages/gbp/rpm/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/*rpm*.py*
diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
index 291cb15a..7a276d7e 100644
--- a/debian/git-buildpackage.install
+++ b/debian/git-buildpackage.install
@@ -6,12 +6,11 @@ usr/bin/git-import-dscs
 usr/bin/git-import-orig
 usr/bin/git-pbuilder
 usr/bin/gbp-create-remote-repo
-usr/lib/python2.?/dist-packages/gbp/dch.py
-usr/lib/python2.?/dist-packages/gbp/deb/
-usr/lib/python2.?/dist-packages/gbp/scripts/buildpackage.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/pq.py
+usr/lib/python*/dist-packages/gbp/deb/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/pq.py*
+usr/lib/python*/dist-packages/gbp/scripts/buildpackage.py*
+usr/lib/python*/dist-packages/gbp/scripts/dch.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dsc.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dscs.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_orig.py*
+usr/lib/python*/dist-packages/gbp/scripts/create_remote_repo.py*
diff --git a/debian/source/options b/debian/source/options
index 6862544b..f2592903 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-extend-diff-ignore = "^(tests/data/rpm/.*|tests/component/rpm/data/.*|tests/component/deb/data/.*)"
+extend-diff-ignore = "^(tests/test_rpm_data/.*|tests/component/rpm/data/.*|tests/component/deb/data/.*)"
 diff-ignore