From bf72c4d3bfa4961fea31987816f1f62d0e4f4616 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 31 Dec 2024 12:35:20 +0100
Subject: [PATCH] Prepare for 0.23.1 release.

* gettext-runtime/intl/libgnuintl.in.h (LIBINTL_VERSION): Bump.
* libtextstyle/version.sh: Update VERSION_NUMBER, RELEASE_DATE.
* gettext-tools/libgettextpo/gettext-po.in.h (LIBGETTEXTPO_VERSION): Bump.
* gettext-runtime/intl/Makefile.am (LTV_*): Bump to 12:2:4.
* libtextstyle/lib/Makefile.am (LTV_*): Bump to 2:3:2.
* gettext-tools/libgettextpo/Makefile.am (LTV_*): Bump to 5:12:5.
* gettext-tools/misc/autopoint.in: Likewise. Accept version 0.23.1.
* gettext-tools/configure.ac (ARCHIVE_VERSION): Bump to 0.23.1.
* NEWS: Update.
---
 NEWS                                       | 7 +++++++
 gettext-runtime/intl/Makefile.am           | 2 +-
 gettext-runtime/intl/libgnuintl.in.h       | 2 +-
 gettext-tools/configure.ac                 | 2 +-
 gettext-tools/libgettextpo/Makefile.am     | 2 +-
 gettext-tools/libgettextpo/gettext-po.in.h | 2 +-
 gettext-tools/misc/autopoint.in            | 2 +-
 libtextstyle/lib/Makefile.am               | 2 +-
 libtextstyle/version.sh                    | 4 ++--
 9 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 95173fc6a..4aafedf9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 0.23.1 - December 2024
+
+* Bug fixes:
+  - Building with libxml2 >= 2.12.0 and gcc >= 14 now works.
+  - XML: The value of the xml:lang attribute, inserted by msgfmt, is now
+    more correct.
+
 Version 0.23 - December 2024
 
 # Internationalized data formats:
diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
index 989565883..40b0b4bea 100644
--- a/gettext-runtime/intl/Makefile.am
+++ b/gettext-runtime/intl/Makefile.am
@@ -440,7 +440,7 @@ endif
 # Before making a gettext release, you must change this according to the
 # libtool documentation, section "Library interface versions".
 LTV_CURRENT=12
-LTV_REVISION=1
+LTV_REVISION=2
 LTV_AGE=4
 
 # How to build libintl.la and libgnuintl.la.
diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index 08d1e19c5..ae81ffedc 100644
--- a/gettext-runtime/intl/libgnuintl.in.h
+++ b/gettext-runtime/intl/libgnuintl.in.h
@@ -54,7 +54,7 @@ extern "C" {
 
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001700
+#define LIBINTL_VERSION 0x001701
 extern int libintl_version;
 
 
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 034936c84..3b1f461d8 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -559,7 +559,7 @@ changequote([,])dnl
 fi
 AC_SUBST([ARCHIVE_FORMAT])
 
-ARCHIVE_VERSION=0.23
+ARCHIVE_VERSION=0.23.1
 AC_SUBST([ARCHIVE_VERSION])
 
 PACKAGE_SUFFIX="-$ARCHIVE_VERSION"
diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index b91a46b4d..6472de63b 100644
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -105,7 +105,7 @@ libgettextpo_la_AUXSOURCES = \
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=5
-LTV_REVISION=11
+LTV_REVISION=12
 LTV_AGE=5
 
 # How to build libgettextpo.la.
diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h
index fb47ef63b..7d2d68121 100644
--- a/gettext-tools/libgettextpo/gettext-po.in.h
+++ b/gettext-tools/libgettextpo/gettext-po.in.h
@@ -28,7 +28,7 @@ extern "C" {
 /* =========================== Meta Information ============================ */
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001700
+#define LIBGETTEXTPO_VERSION 0x001701
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index fdadfa8c0..133a71540 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -392,7 +392,7 @@ case "$ver" in
   0.20 | 0.20.2 | \
   0.21 | 0.21.1 | \
   0.22 | 0.22.1 | 0.22.2 | 0.22.3 | 0.22.4 | 0.22.5 | \
-  0.23 )
+  0.23 | 0.23.1 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am
index c4a412794..f5ad18907 100644
--- a/libtextstyle/lib/Makefile.am
+++ b/libtextstyle/lib/Makefile.am
@@ -283,7 +283,7 @@ AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1
 # Libtool's library version information for libtextstyle.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=2
-LTV_REVISION=2
+LTV_REVISION=3
 LTV_AGE=2
 
 # How to build libtextstyle.la.
diff --git a/libtextstyle/version.sh b/libtextstyle/version.sh
index 5f339cbaa..3cefbe7c3 100644
--- a/libtextstyle/version.sh
+++ b/libtextstyle/version.sh
@@ -1,3 +1,3 @@
 # Version number and release date.
-VERSION_NUMBER=0.23
-RELEASE_DATE=2024-12-01      # in "date +%Y-%m-%d" format
+VERSION_NUMBER=0.23.1
+RELEASE_DATE=2024-12-31      # in "date +%Y-%m-%d" format
-- 
2.47.3