From: jingui.ren <jingui.ren@samsung.com>
Date: Fri, 21 Sep 2018 07:46:00 +0000 (+0800)
Subject: Upgrade to 0.25.5
X-Git-Tag: staging-released-tools-18.01.8^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e422b085b4a122c04a4e3f998b43798b8e2c0ae7;p=tools%2Fgbs.git

Upgrade to 0.25.5

Change-Id: I156a4e27fc4b7de6294f692c8dfddcf11e48a0da
---

diff --git a/debian/changelog b/debian/changelog
index 139d863..523a712 100755
--- 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 b50b339..40571fc 100755
--- 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 18c483a..7539987 100755
--- 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 87cabbc..8003d9e 100755
--- 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 b2f59ce..dcbabb7 100755
--- 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