<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<font size="2"><font face="monospace">Hi, <br>
<br>
There are 2 options that can be done:<br>
<br>
1. justify commit message:<br>
Say that files other than changelog were updated manually.<br>
<br>
OR<br>
<br>
2. Divide the commit into two separate commits for changing
version, and changelog via gbp.<br>
<br>
Thanks,<br>
Viraj<br>
<br>
<br>
</font></font><br>
<div class="moz-cite-prefix">On 10/18/22 16:08, Bastian Germann
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:20221018140857.22796-1-bage@linutronix.de">
<pre class="moz-quote-pre" wrap="">Generate the changelog via gbp.
Signed-off-by: Bastian Germann <a class="moz-txt-link-rfc2396E" href="mailto:bage@linutronix.de"><bage@linutronix.de></a>
---
debian/changelog | 10 ++++++++++
elbe.spec | 2 +-
elbepack/tests/test_version.py | 2 +-
elbepack/version.py | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c27149edf..c7a96bd23f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+elbe (14.6.1) unstable; urgency=medium
+
+ * Team upload
+ * contrib: k8s: Use elbe-archive-keyring trust anchor
+ * contrib: k8s: Add elbe-common repo
+ * contrib: dockerfile: Update to bullseye
+ * initvmaction: Prevent early repodir webserver termination
+
+ -- Bastian Germann <a class="moz-txt-link-rfc2396E" href="mailto:bage@linutronix.de"><bage@linutronix.de></a> Tue, 18 Oct 2022 16:07:10 +0200
+
elbe (14.6) unstable; urgency=medium
* README.adoc: Update Dependency as per latest version
diff --git a/elbe.spec b/elbe.spec
index 78831e6ec5..ec3510e5a5 100644
--- a/elbe.spec
+++ b/elbe.spec
@@ -3,7 +3,7 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: elbe
-Version: 14.6
+Version: 14.6.1
Release: 1
Summary: Elbe (Embedded Linux Build Environment)
diff --git a/elbepack/tests/test_version.py b/elbepack/tests/test_version.py
index 362163a93f..466da73ec9 100644
--- a/elbepack/tests/test_version.py
+++ b/elbepack/tests/test_version.py
@@ -12,7 +12,7 @@ from elbepack.version import elbe_version
class TestElbepackVersion(unittest.TestCase):
# This is a read-only state that is the same for every tests
- expected_version = "14.6"
+ expected_version = "14.6.1"
def setUp(self):
# This is a mutable state that is different for every tests
diff --git a/elbepack/version.py b/elbepack/version.py
index 98c3120245..5cdaeced0e 100644
--- a/elbepack/version.py
+++ b/elbepack/version.py
@@ -7,7 +7,7 @@
from elbepack.directories import pack_dir
-elbe_version = "14.6"
+elbe_version = "14.6.1"
elbe_initvm_packagelist = ['python3-elbe-buildenv',
'python3-elbe-soap',
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">
</pre>
</body>
</html>