Upgrade to 0.25.5

Change-Id: I156a4e27fc4b7de6294f692c8dfddcf11e48a0da
Signed-off-by: jingui.ren <jingui.ren@samsung.com>

diff --git a/debian/changelog b/debian/changelog
index 5df10f2e5fa006e735be6a5ddef44eafc0079f17..e6c36f4eb4cfbdbd768285f577c7d984e9401b70 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gbs (0.25.5) unstable; urgency=high
+  * upgrade to gbs v0.25.5, which contains the following features:
+    * Bug fix:
+      - Fix file conflicts when package install
+ -- Ren Jingui <jingui.ren@samsung.com>  Thu, 27 Sep 2018 12:30:00 +0800
+
 gbs (0.25.4) unstable; urgency=high
   * upgrade to gbs v0.25.4, which contains the following features:
     * Bug fix:

diff --git a/docs/RELEASE_NOTES b/docs/RELEASE_NOTES
index a685175211ff2e97302da4a236c248dff722b7e9..265c4155423fda21603890378a3054268e94ad83 100755 (executable)
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
@@ -1,3 +1,11 @@
+Release notes for gbs 0.25.5
+==========================
+
+- Release Date: 2018-09
+
+- Bug fix:
+    * Fix file conflicts when package install
+
 Release notes for gbs 0.25.4
 ==========================
 

diff --git a/gitbuildsys/__init__.py b/gitbuildsys/__init__.py
index 18c483adc2a7a0bb4af029a5af88b3ae6f0b2e48..753998799eecf4927efa20d77000a32693b03d8c 100755 (executable)
--- a/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py
@@ -20,4 +20,4 @@
 module for gbs tool
 """
 
-__version__ = "0.25.4"
+__version__ = "0.25.5"

diff --git a/packaging/gbs.changes b/packaging/gbs.changes
index 7460bd2264ab122b531b19c6fbb3e8508825ab75..f3678d5d276153430c845acbaa327ed72712ea4d 100755 (executable)
--- a/packaging/gbs.changes
+++ b/packaging/gbs.changes
@@ -1,3 +1,8 @@
+* Thu Sep 27 2018 Ren Jingui <jingui.ren@samsung.com> 0.25.5
+  * upgrade to gbs v0.25.5, which contains the following features:
+    * bug fix
+      - Fix file conflicts when package install
+
 * Fri Aug 31 2018 Ren Jingui <jingui.ren@samsung.com> 0.25.4
   * upgrade to gbs v0.25.4, which contains the following features:
     * bug fix

diff --git a/packaging/gbs.spec b/packaging/gbs.spec
index 1688292c06158cddd977181db42fb978a57ced3e..a9431849a273a781e4c0fbb7863cee8942eb8ddc 100755 (executable)
--- a/packaging/gbs.spec
+++ b/packaging/gbs.spec
@@ -6,7 +6,7 @@
 
 Name:       gbs
 Summary:    The command line tools for Tizen package developers
-Version:    0.25.4
+Version:    0.25.5
 %if 0%{?opensuse_bs}
 Release:    1.<CI_CNT>.<B_CNT>
 %else