packaging: rebase on top of upstream version 0.6.15

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/debian/changelog b/debian/changelog
index 81fe0634a2dee604a7bd9b8f411f2e77bff1e400..1c253ade114d5d4dfc3ef1b41e62c9c1b12afd40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-buildpackage (0.6.15-tizen20140605) UNRELEASED; urgency=low
+
+  * Rebase on top of upstream version 0.6.15
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Thu, 05 Jun 2014 13:54:54 +0300
+
 git-buildpackage (0.6.15) unstable; urgency=medium
 
   * [5cde49a] Revert "Determine build_dir upfront"

diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes
index 448846dee3a0607871b4a933f39a4bdfd326dae7..7842c803244cf646435d0f1a81c11313583c671e 100644 (file)
--- a/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
@@ -1,3 +1,6 @@
+* Thu Jun 05 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> debian/0.6.15-212-gdbb401b
+- Rebase on top of upstream version 0.6.15
+
 * Wed May 21 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.12-20140521
 - Rebase on top of upstream version 0.6.12
 - Changes in rpm-ch

diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index d70c870d0a26ecbb410ed31e8fb66fa903922bab..e15fc0f7791757fd51fbf7c473be0b46c4ce667a 100644 (file)
--- 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.12
+Version:    0.6.15
 Release:    0
 Group:      Development/Tools/Building
 License:    GPLv2
@@ -100,7 +100,7 @@ Group:      Development/Tools/Building
 Requires:   %{name}-common = %{version}-%{release}
 Requires:   rpm
 Requires:   %{rpm_python_pkg_name}
-Provides:   tizen-gbp-rpm = 20140521
+Provides:   tizen-gbp-rpm = 20140605
 
 %description rpm
 Set of tools from Debian that integrate the package build system with Git.