From 3f9b5675e971a46ad05d716e91e16658e6c1df63 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 14 Nov 2014 14:08:58 +0200 Subject: [PATCH] packaging: rebase on top of upstream version 0.6.22 Signed-off-by: Markus Lehtonen --- debian/changelog | 6 ++++++ packaging/git-buildpackage.changes | 3 +++ packaging/git-buildpackage.spec | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8faf98..0d17c73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-buildpackage (0.6.22-tizen20141114) UNRELEASED; urgency=low + + * Rebase on top of upstream version 0.6.22 + + -- Markus Lehtonen Fri, 14 Nov 2014 14:10:18 +0200 + git-buildpackage (0.6.22) unstable; urgency=medium * [3d8939d] git.vfs: fix close method. Preventing a infinite recursion diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes index 6a65a15..0ac2ec7 100644 --- a/packaging/git-buildpackage.changes +++ b/packaging/git-buildpackage.changes @@ -1,3 +1,6 @@ +* Fri Nov 14 2014 Markus Lehtonen debian/0.6.22-195-g97ce593 +- Rebase on top of upstream version 0.6.22 + * Thu Aug 28 2014 Markus Lehtonen tizen/0.6.15-20140828 - Rebase on top of upstream version 0.6.15 - Changes in buildpackage-rpm diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 0f9a81c..bfa2d3e 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.15 +Version: 0.6.22 Release: 0 Group: Development/Tools/Building License: GPLv2 @@ -111,7 +111,7 @@ Recommends: rpm-build %else Requires: rpm-build %endif -Provides: tizen-gbp-rpm = 20140828 +Provides: tizen-gbp-rpm = 20141114 %description rpm Set of tools from Debian that integrate the package build system with Git. -- 2.7.4