summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-06-11 17:55:43 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-06-11 17:55:43 +0300
commita8c3ec7b4e892f50d9023201c86a2ffd5d54548a (patch)
treeb143a45eefcab6a0d40ed8a66d1a15c0fc03373f
parent7bf2b1db9b755c6a6387c3cf76056b812ade5ad0 (diff)
downloadlibrpm-tizen-a8c3ec7b4e892f50d9023201c86a2ffd5d54548a.tar.gz
librpm-tizen-a8c3ec7b4e892f50d9023201c86a2ffd5d54548a.tar.bz2
librpm-tizen-a8c3ec7b4e892f50d9023201c86a2ffd5d54548a.zip
Rebase on top of latest Tizen 3.0 codetest-devel
Change-Id: Ie9de5638834ec6486c73427f6bd6b315dcb8eaec Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--debian/changelog6
-rw-r--r--packaging/librpm-tizen.changes3
-rw-r--r--packaging/librpm-tizen.spec4
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5022d0df6..55291f9e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librpm-tizen (4.11.0.1.tizen20140530-tizen20140611) UNRELEASED; urgency=low
+
+ * Rebase on latest Tizen 3.0
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Wed, 11 Jun 2014 17:50:05 +0300
+
librpm-tizen (4.11.0.1.tizen20130618-tizen20140306) unstable; urgency=low
[ Markus Lehtonen ]
diff --git a/packaging/librpm-tizen.changes b/packaging/librpm-tizen.changes
index e2fdad281..35f542e0a 100644
--- a/packaging/librpm-tizen.changes
+++ b/packaging/librpm-tizen.changes
@@ -1,3 +1,6 @@
+* Wed Jun 11 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/4.11.0.1.tizen20140530-38-g7bf2b1d
+- Rebase on latest Tizen 3.0
+
* Thu Mar 06 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen-tools/4.11.0.1.tizen20130618-20140306
- Fix build against Lua 5.2
diff --git a/packaging/librpm-tizen.spec b/packaging/librpm-tizen.spec
index 5363c496a..c82ca111f 100644
--- a/packaging/librpm-tizen.spec
+++ b/packaging/librpm-tizen.spec
@@ -5,7 +5,7 @@ Name: librpm-tizen
Summary: The RPM libraries for git-buildpackage
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 4.11.0.1.tizen20130618
+Version: 4.11.0.1.tizen20140530
Release: 0
Url: http://www.rpm.org
BuildRequires: binutils
@@ -60,7 +60,7 @@ Source1001: rpm.manifest
Source0: rpm-%{version}.tar.gz
AutoReqProv: No
-Provides: rpm-tizen = %{version}-tizen20140306
+Provides: rpm-tizen = %{version}-tizen20140611
#
# avoid bootstrapping problem
%define _binary_payload w9.bzdio