From: Matthias Klose <doko@debian.org>
Date: Fri, 18 Feb 2022 04:46:44 +0000 (+0000)
Subject: branch-version
X-Git-Tag: archive/raspbian/2.38-2+rpi1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0a9fa13bad27ecf011876467d59feb5979327db3;p=binutils.git

branch-version

# DP: Don't bump the version when doing distro builds

# DP: Don't bump the version when doing distro builds

git diff acda0027559c6112ea91af13fb32dd4bef8f0b8b 9288e0fae61b716ce75334be906283de8b18b787


Gbp-Pq: Name branch-version.diff
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4671dc30c..d1602bebf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -2,11 +2,6 @@
 
 	* po/sr.po: Updated Serbian translation.
 
-2022-02-09  Nick Clifton  <nickc@redhat.com>
-
-	* development.sh (development): Set to true.
-	* version.m4 (BFD_VERSION): Set to 2.38.0.
-
 2022-02-09  Nick Clifton  <nickc@redhat.com>
 
 	2.38 release.
diff --git a/bfd/development.sh b/bfd/development.sh
index 6d29dc261..cd6420266 100644
--- a/bfd/development.sh
+++ b/bfd/development.sh
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Controls whether to enable development-mode features by default.
-development=true
+development=false
 
 # Indicate whether this is a release branch.
 experimental=false
diff --git a/bfd/version.m4 b/bfd/version.m4
index 1b8f4a3cb..f611cacaa 100644
--- a/bfd/version.m4
+++ b/bfd/version.m4
@@ -1 +1 @@
-m4_define([BFD_VERSION], [2.38.0])
+m4_define([BFD_VERSION], [2.38])
diff --git a/gas/ChangeLog b/gas/ChangeLog
index d94d61ca2..8ef1d3055 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -197,11 +197,6 @@
 	* testsuite/gas/all/overflow.l Change expected output format.
 	* po/gas.pot: Regenerate.
 
-2021-07-03  Nick Clifton  <nickc@redhat.com>
-
-	* configure: Regenerate.
-	* po/gas.pot: Regenerate.
-
 2021-07-03  Nick Clifton  <nickc@redhat.com>
 
 	* 2.37 release branch created.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3be5c5c76..624ab937e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -180,11 +180,6 @@
 	* testsuite/ld-riscv-elf/ld-riscv-elf.exp
 	(run_relax_twice_test): New, and call it.
 
-2021-07-03  Nick Clifton  <nickc@redhat.com>
-
-	* configure: Regenerate.
-	* po/ld.pot: Regenerate.
-
 2021-07-03  Nick Clifton  <nickc@redhat.com>
 
 	* 2.37 release branch created.
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 0c52667b1..b0b4c8fde 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -98,11 +98,6 @@
 
 	* s390-opc.txt: Add qpaci.
 
-2021-07-03  Nick Clifton  <nickc@redhat.com>
-
-	* configure: Regenerate.
-	* po/opcodes.pot: Regenerate.
-
 2021-07-03  Nick Clifton  <nickc@redhat.com>
 
 	* 2.37 release branch created.