summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-11-07 13:54:08 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-01-14 13:49:53 +0200
commitad884539b96a36262da695ffe698f2435f5618c0 (patch)
tree2dcb16eea836e5ad9783e4ec699931f5713568e0
parente4d0fd773dcf112bd18099125ed77e737529bfbf (diff)
downloadgit-buildpackage-ad884539b96a36262da695ffe698f2435f5618c0.tar.gz
git-buildpackage-ad884539b96a36262da695ffe698f2435f5618c0.tar.bz2
git-buildpackage-ad884539b96a36262da695ffe698f2435f5618c0.zip
packaging: rebase on top of upstream version 0.6.8
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--debian/changelog6
-rw-r--r--packaging/git-buildpackage.changes3
-rw-r--r--packaging/git-buildpackage.spec4
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 34ce393f..9868537d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-buildpackage (0.6.8-tizen20140107) UNRELEASED; urgency=low
+
+ * Rebase on top of upstream version 0.6.8
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Tue, 07 Jan 2014 15:10:00 +0200
+
git-buildpackage (0.6.8) unstable; urgency=medium
* [f5718b8] No need to document --verbose. Properly document --help
diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes
index 938808e2..decf5f79 100644
--- a/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
@@ -1,3 +1,6 @@
+* Tue Jan 07 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.8
+- Rebase on top of upstream version 0.6.8
+
* Mon Dec 02 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.6
- Rebase on top of upstream version 0.6.6
- UpstreamSource: fix archive prefix guessing
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index e4b928ef..64ee70af 100644
--- 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.6
+Version: 0.6.8
Release: 0
Group: Development/Tools/Building
License: GPLv2
@@ -97,7 +97,7 @@ Group: Development/Tools/Building
Requires: %{name}-common = %{version}-%{release}
Requires: rpm
Requires: %{rpm_python_pkg_name}
-Provides: tizen-gbp-rpm = 20131202
+Provides: tizen-gbp-rpm = 20140107
%description rpm
Set of tools from Debian that integrate the package build system with Git.