packaging: rebase on top of upstream version 0.6.24

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

diff --git a/debian/changelog b/debian/changelog
index 4322dae033c65d0bbb05b464e1a28949fc73af67..73233d0fdb1d7f14939accdd045e7d8523cd1c73 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-buildpackage (0.6.24-tizen20150223) UNRELEASED; urgency=low
+
+  * Rebase on top of upstream version 0.6.24
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Mon, 23 Feb 2015 16:18:33 +0200
+
 git-buildpackage (0.6.24) experimental; urgency=medium
 
   [ Guido Günther ]

diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes
index 6063de2857806c1d5f7c6439f9fed028cbe49ed5..611089083580249c3ad2a5b75f7e0e7474550378 100644 (file)
--- a/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
@@ -1,3 +1,6 @@
+* Mon Feb 23 2015 Markus Lehtonen <markus.lehtonen@linux.intel.com> debian/0.6.24-190-ga04f560
+- Rebase on top of upstream version 0.6.24
+
 * Tue Feb 17 2015 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.22-20150217
 - log: don't crash getLogger if getting the root logger
 

diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index df82706c229dbf5ed61717bcac5661752de6f73a..c3bab909d21e5241bdd49fe501b0d21ba9b4ab08 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.22
+Version:    0.6.24
 Release:    0
 Group:      Development/Tools/Building
 License:    GPLv2
@@ -116,7 +116,7 @@ Recommends: rpm-build
 %else
 Requires:   rpm-build
 %endif
-Provides:   tizen-gbp-rpm = 20150217
+Provides:   tizen-gbp-rpm = 20150223
 
 %description rpm
 Set of tools from Debian that integrate the package build system with Git.