From 31a52b28de3581b2859fd020a0d221d54d8e57f7 Mon Sep 17 00:00:00 2001 From: SoonKyu Park Date: Sat, 11 Jun 2016 18:44:31 +0900 Subject: [PATCH] Upgrade version to 0.6.27 - Upgrade tizen-gbp-rpm version to 20160302 - re-arrage package dependency for debian Change-Id: I6d7d505d5a8ba28cb4bfa59a83ab9af657fa43f4 --- debian/changelog | 7 +++++++ debian/control | 9 +++++++-- packaging/PKGBUILD | 4 ++-- packaging/git-buildpackage.changes | 3 +++ packaging/git-buildpackage.spec | 5 +++-- 5 files changed, 22 insertions(+), 6 deletions(-) mode change 100644 => 100755 debian/changelog mode change 100644 => 100755 debian/control mode change 100644 => 100755 packaging/PKGBUILD mode change 100644 => 100755 packaging/git-buildpackage.changes mode change 100644 => 100755 packaging/git-buildpackage.spec diff --git a/debian/changelog b/debian/changelog old mode 100644 new mode 100755 index d490629..bbd64ed --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 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 diff --git a/debian/control b/debian/control old mode 100644 new mode 100755 index db7e05f..3bae388 --- a/debian/control +++ b/debian/control @@ -19,6 +19,9 @@ Build-Depends: python-setuptools, rpm, sgml2x, + librpm-tizen, +# For rpm (epydoc) + rpm-common, 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 @@ -62,11 +65,13 @@ 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 + rpm-common, + rpm2cpio,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 repository diff --git a/packaging/PKGBUILD b/packaging/PKGBUILD old mode 100644 new mode 100755 index dbe4b00..60ffa9f --- a/packaging/PKGBUILD +++ b/packaging/PKGBUILD @@ -1,6 +1,6 @@ pkgbase='git-buildpackage' pkgname=('git-buildpackage-rpm' 'git-buildpackage-common' 'git-buildpackage-doc') -pkgver=0.6.15 +pkgver=0.6.27 pkgrel=0 pkgdesc="Tools from Debian to integrate the package build system with Git" arch=(any) @@ -53,7 +53,7 @@ package_git-buildpackage-common() { package_git-buildpackage-rpm() { depends=("git-buildpackage-common=$pkgver-$pkgrel" "rpm") - provides=("tizen-gbp-rpm=20140605") + provides=("tizen-gbp-rpm=20160302") cd $srcdir/$pkgbase-$pkgver WITHOUT_NOSETESTS=1 \ python2 setup.py install \ diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes old mode 100644 new mode 100755 index c9dcafc..5f8ecf5 --- a/packaging/git-buildpackage.changes +++ b/packaging/git-buildpackage.changes @@ -1,3 +1,6 @@ +* Wed Mar 02 2016 Jun Wang tizen/0.6.27-20160302 +- Upgrade version to 0.6.27 + * Fri Feb 06 2015 Markus Lehtonen tizen/0.6.22-20150206 - Rebase on top of upstream version 0.6.22 - Experimental support for BitBake diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec old mode 100644 new mode 100755 index db5ccc0..bc6c190 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -3,7 +3,7 @@ Name: git-buildpackage Summary: Build packages from git -Version: 0.6.22 +Version: 0.6.27 Release: 0 Group: Development/Tools/Building License: GPLv2 @@ -115,7 +115,7 @@ Recommends: rpm-build %else Requires: rpm-build %endif -Provides: tizen-gbp-rpm = 20150206 +Provides: tizen-gbp-rpm = 20160302 %description rpm Set of tools from Debian that integrate the package build system with Git. @@ -267,6 +267,7 @@ done %files rpm %defattr(-,root,root,-) %dir %{python_sitelib}/gbp/rpm +%{_bindir}/*rpm* %{python_sitelib}/gbp/scripts/*rpm*.py* %{python_sitelib}/gbp/rpm/*py* %if %{with docs} -- 2.7.4