Merge from 0.23.x branch: 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.

diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
index 989565883e7aac2a978137ab535041a4f064ad6e..40b0b4bea9eff6dba857e424ec08044a891a4cb8 100644 (file)
--- 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 08d1e19c52fddbdcc74207313123eb93609005af..ae81ffedcb7a3e5ae5fec37ea50a2caa3063779c 100644 (file)
--- 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 5ff18b81ee92364246552d5e06985601899afb85..b863e0f2b6ee3198762e8574c5442bdbc2dc0494 100644 (file)
--- 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 b91a46b4d0d86c9b44d9fe212bd4ed8a54235530..6472de63b073da339b7a8a817f1de1cd56541722 100644 (file)
--- 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 fb47ef63bd762ce6b502f994db841bf8918a4114..7d2d68121a6d605ed124d9dc2cec8245fec378c1 100644 (file)
--- 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 928ec99be09906063b743822799dac03b5cc6520..004bb80333b742d1ac5c615197bb0c61187fb6bf 100644 (file)
--- 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 c4a412794f9e1e10253fd287ec3bf99e0fa8dd68..f5ad189075f44dd0379ec362e00d8cbf7b119768 100644 (file)
--- 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 5f339cbaa20cdf6c730354fa33cdea429a0b68ab..3cefbe7c38a85e87bc756938e2102e76528289f3 100644 (file)
--- 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