From f2f3a2346be7cbcc9f72cf2bf5329aa4aa837c6e Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Fri, 29 Jan 2016 16:30:03 +0800 Subject: fix build problem on Debian_8 Change-Id: I145928ae1416f7847b4d8e6729c1daf07e2ab757 --- debian/control | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index db7e05fb..58746a47 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,9 @@ Build-Depends: python-setuptools, rpm, sgml2x, + librpm-tizen, +# For rpm (epydoc) + 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 -- cgit v1.2.3 From 75c58f7f034a997ec8377820431c7ebb70c7d34b Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Wed, 2 Mar 2016 17:44:57 +0800 Subject: upgrade to 0.6.26 Change-Id: Id72b3231c078edd97ea5994b6ccd00ffb7d71162 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d490629d..94445748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-buildpackage (0.6.26) 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 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 -- cgit v1.2.3 From 38470a55fe4b85fbb1aabc51ab1285ab4b817d7f Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Wed, 2 Mar 2016 17:50:03 +0800 Subject: upgrade to 0.6.27 Change-Id: I4b29f41472de96278396ed0692e82e214fa9085a --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 94445748..ee6a5c4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-buildpackage (0.6.26) unstable; urgency=medium +git-buildpackage (0.6.27) unstable; urgency=medium * Fix error logs when __import__ faild,like "No handlers could be found fo logger" * Fix build problem on Debian 8 -- cgit v1.2.3 From 5e389d45d9ad5606928cefbb79b11d428e2f0ad9 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Wed, 2 Mar 2016 18:33:22 +0800 Subject: change version files to match 0.6.27 Change-Id: I6dc3023b4bccffef4f0113229ae0eaf4ddcfc74f --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee6a5c4f..bbd64edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-buildpackage (0.6.27) 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 -- cgit v1.2.3 From 5bc292d8a471ad929a2d1c4d29de2006665b21de Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 8 Mar 2016 18:00:33 +0800 Subject: Check devel branch codes to be good from latest release tizen/0.6.27-20160302 Change-Id: I87f32c6b28b8835c09004530d7e6e429143dc4bf --- debian/changelog | 105 +++++++++++++++++---------------- debian/git-buildpackage-common.install | 29 +++------ debian/git-buildpackage-rpm.install | 5 +- debian/git-buildpackage.install | 17 +++--- 4 files changed, 74 insertions(+), 82 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bbd64edb..ee6ad668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,60 @@ git-buildpackage (0.6.22-tizen20150206) unstable; urgency=low -- Markus Lehtonen Fri, 06 Feb 2015 10:36:26 +0200 + * Upgrade version to 0.6.25 + + -- Rong Jinhui 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 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 +201,6 @@ git-buildpackage (0.6.16) experimental; urgency=medium -- Guido Günther 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 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/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* -- cgit v1.2.3 From 9a52da6cab99e92327416edce2c7daf75cad16c2 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 8 Mar 2016 18:18:58 +0800 Subject: Make new tag in devel Change-Id: Idc6a43b5a475733ad8568d041384319157db9a5c --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee6ad668..4c36fbf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-buildpackage (0.6.27-tizen20160308) unstable; urgency=medium + + * Check codes in devel branch + + -- Jun Wang TUE, 08 Mar 2016 10:20:21 +0800 + + + git-buildpackage (0.6.27-tizen20160302) unstable; urgency=medium * Fix error logs when __import__ faild,like "No handlers could be found fo logger" -- cgit v1.2.3 From 59467c0f9e6eff4e875cd679daeac27374d2070b Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 8 Mar 2016 19:03:06 +0800 Subject: fix spec and control error Change-Id: Ia455b5475e56ff2344cba8ac3d5c47da9e306c29 --- debian/control | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 58746a47..e5c828c9 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,9 @@ 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) @@ -65,13 +62,15 @@ Description: Suite to help with Debian packages in Git repositories Package: git-buildpackage-rpm Architecture: all Depends: ${python:Depends}, + ${shlibs:Depends}, ${misc:Depends}, - git-buildpackage-common (= ${binary:Version}), python-rpm, - rpm, -Description: Suite to help with RPM packages in Git repositories + 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 -- cgit v1.2.3 From b0b7977e8517e13f81b89787bfb18499fa722d6a Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Wed, 9 Mar 2016 17:34:20 +0800 Subject: change version to 0.6.28 in devel branch Change-Id: I51379cbfa73533f9c7737ad9ff16107e83129d83 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c36fbf8..a6adc71f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-buildpackage (0.6.27-tizen20160308) unstable; urgency=medium +git-buildpackage (0.6.28-tizen20160308) unstable; urgency=medium * Check codes in devel branch -- cgit v1.2.3 From cd4c5addd10e00af3c480b941fb52057573b7c67 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 10 May 2016 15:03:01 +0800 Subject: 1. Reset to 0.27 2. Keep same code with latest release Change-Id: I30588773b0a039c9f5002bf65b5c768a16fb7935 --- debian/changelog | 8 -------- debian/source/options | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a6adc71f..ee6ad668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -git-buildpackage (0.6.28-tizen20160308) unstable; urgency=medium - - * Check codes in devel branch - - -- Jun Wang TUE, 08 Mar 2016 10:20:21 +0800 - - - git-buildpackage (0.6.27-tizen20160302) unstable; urgency=medium * Fix error logs when __import__ faild,like "No handlers could be found fo logger" 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 -- cgit v1.2.3 From 5b9b6f2d40a7659e581b38385fd4979282ed1a63 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Wed, 18 May 2016 11:46:57 +0800 Subject: Due to Ubuntu 16.04 provide git-buildpackage with latest version 0.7.2, so we need update local version number to 0.7.4(latest) and make sure gbs has same local codes. Change-Id: I6791a61abe765a994ef28461f236137a3d979d2a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee6ad668..581544d6 100644 --- 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 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" -- cgit v1.2.3