Upgrade to 0.26.1

Change-Id: I9c2260a5f3811a70506cdd7d279d40f26511d4f1
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/debian/changelog b/debian/changelog
index eb2b3368c088bc3452148e6ca4f13b1806306940..8f38c79e9544aab6785b9550e4f50fb2bd3bd8e1 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gbs (0.26.1) unstable; urgency=high
+  * upgrade to gbs v0.26.1, which contains the following features:
+     * New feature and enhancements added:
+      - Add new option for gbs to import source package list.
+      - Add warning message for encoded password in gbs config message.
+      - Update default gbs.conf tempalte.
+      - Force to change sehbang in /usr/bin/gbs to python2.
+      - Force to depends on librpm-tizen obviously.
+     * Bug fix:
+      - Fix the gbs export doesn't generate patches when packaging non-native package.
+
 gbs (0.25.30) unstable; urgency=high
   * upgrade to gbs v0.25.30, which contains the following features:
      * New feature and enhancements added:

diff --git a/debian/control b/debian/control
index da4c0117fdf04c3c53710248e9c8ff7aeaa4c00f..98247ab31a7b21b28001b2bc6bf65552d48cfa33 100755 (executable)
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Depends: ${misc:Depends}, ${python:Depends},
  gbs-export (= ${binary:Version}),
  gbs-remotebuild (= ${binary:Version}),
  gbs-bsr (= ${binary:Version}),
- depanneur (>= 0.16.22),
- librpm-tizen (>= 4.11.0.1.tizen20130618-tizen20131001)
+ depanneur (>= 0.16.23),
+ librpm-tizen (>= 4.11.0.1.tizen20140530-tizen20140723)
 Description: Command line tools for Tizen package developers
  The command line tools for Tizen package developers will
  be used to do packaging related tasks.
@@ -32,8 +32,8 @@ Depends: ${misc:Depends}, ${python:Depends},
  python-pycurl,
  osc (>= 0.132.6),
  git-buildpackage-rpm
-Conflicts: gbs (<< 0.15)
-Replaces: gbs (<< 0.15)
+Conflicts: gbs (<< 0.25.29)
+Replaces: gbs (<< 0.25.29)
 Description: GBS API
  This package contains gbs APIs, which can be used by
  external software.
@@ -44,8 +44,8 @@ Depends: ${misc:Depends}, ${python:Depends},
  gbs-api (= ${binary:Version}),
  pristine-tar (>= 1.35-tizen20161231),
  git-buildpackage-rpm
-Conflicts: gbs (<< 0.15)
-Replaces: gbs (<< 0.15)
+Conflicts: gbs (<< 0.25.29)
+Replaces: gbs (<< 0.25.29)
 Description: GBS export API
  This package contains gbs export APIs, which can be used by
  external software.
@@ -56,8 +56,8 @@ Depends: ${misc:Depends}, ${python:Depends},
  gbs-api (= ${binary:Version}),
  gbs-export (= ${binary:Version}),
  git-buildpackage-rpm
-Conflicts: gbs (<< 0.18.1)
-Replaces: gbs (<< 0.18.1)
+Conflicts: gbs (<< 0.25.29)
+Replaces: gbs (<< 0.25.29)
 Description: GBS remotebuild API
  This package contains gbs remotebuild APIs, which can be used by
  external software.

diff --git a/docs/RELEASE_NOTES b/docs/RELEASE_NOTES
index d9d248407e79a4e7ab2d532c3767a6c8a511b057..ee9bcb77342befee31b03d732f2bc628abea494a 100755 (executable)
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
@@ -1,3 +1,17 @@
+Release notes for gbs 0.26.1
+==========================
+
+- Release Date: 2024-1
+
+- New feature and enhancements added:
+    * Add new option for gbs to import source package list.
+    * Add warning message for encoded password in gbs config message.
+    * Update default gbs.conf tempalte.
+    * Force to change sehbang in /usr/bin/gbs to python2.
+    * Force to depends on librpm-tizen obviously.
+- Bug fix:
+    * Fix the gbs export doesn't generate patches when packaging non-native package.
+
 Release notes for gbs 0.25.30
 ==========================
 

diff --git a/gitbuildsys/__init__.py b/gitbuildsys/__init__.py
index 8e0e1a8cbc1469ba290fb38dbaa81f2a21fc2b39..0a4d116b0c2d2eaee8ec132f154fbdd0be8cd197 100755 (executable)
--- a/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py
@@ -20,4 +20,4 @@
 module for gbs tool
 """
 
-__version__ = "0.25.30"
+__version__ = "0.26.1"

diff --git a/packaging/gbs.changes b/packaging/gbs.changes
index a4d772a00c7cb85748284c877bf50475c9896444..3ab50c5ed8c4a76f33bf2b39c21f49b44e44c232 100755 (executable)
--- a/packaging/gbs.changes
+++ b/packaging/gbs.changes
@@ -1,3 +1,14 @@
+* Wed Jan 17 2024 Wanchao Xu <wanchao.xu@samsung.com> 0.26.1
+  * upgrade to gbs v0.26.1, which contains the following features:
+    * New feature and enhancements added:
+      - Add new option for gbs to import source package list.
+      - Add warning message for encoded password in gbs config message.
+      - Update default gbs.conf tempalte.
+      - Force to change sehbang in /usr/bin/gbs to python2.
+      - Force to depends on librpm-tizen obviously.
+    * Bug fix:
+      - Fix the gbs export doesn't generate patches when packaging non-native package.
+
 * Wed May 10 2023 Biao Wang <biao716.wang@samsung.com> 0.25.30
   * upgrade to gbs v0.25.30, which contains the following features:
     * New feature and enhancements added:

diff --git a/packaging/gbs.spec b/packaging/gbs.spec
index 6093309a0d570b007f3ca29bdb7839577babc3ec..d49a8e8d86304364e4dc203f659bfcf0785433cb 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.30
+Version:    0.26.1
 %if 0%{?opensuse_bs}
 Release:    1.<CI_CNT>.<B_CNT>
 %else
@@ -24,13 +24,13 @@ Requires:   python-lxml
 Requires:   sudo
 Requires:   osc >= 0.132.6
 Requires:   tizen-gbp-rpm >= 20210514
-Requires:   depanneur >= 0.16.22
+Requires:   depanneur >= 0.16.23
 
 %if "%{?python_version}" < "2.7"
 Requires:   python-argparse
 %endif
 %if ! 0%{?tizen_version:1}
-Requires:   rpm-tizen >= 4.11.0.1.tizen20130618-tizen20131001
+Requires:   rpm-tizen >= 4.11.0.1.tizen20140530-tizen20140723
 %endif
 Requires:   %{name}-api = %{version}-%{release}
 Requires:   %{name}-export = %{version}-%{release}
@@ -46,7 +46,7 @@ be used to do packaging related tasks.
 
 %package api
 Summary:       GBS APIs
-Conflicts:     gbs < 0.15
+Conflicts:     gbs < 0.25.29
 Requires:      python
 Requires:      python-pycurl
 Requires:      osc >= 0.132.6
@@ -58,7 +58,7 @@ external software.
 
 %package export
 Summary:       GBS export module
-Conflicts:     gbs < 0.15
+Conflicts:     gbs < 0.25.29
 Requires:      python
 Requires:      tizen-pristine-tar >= 20161231
 Requires:      gbs-api = %{version}-%{release}
@@ -70,7 +70,7 @@ external software.
 
 %package remotebuild
 Summary:       GBS remotebuild module
-Conflicts:     gbs < 0.18.1
+Conflicts:     gbs < 0.25.29
 Requires:      python
 Requires:      gbs-api = %{version}-%{release}
 Requires:      gbs-export = %{version}-%{release}