Merge from 0.24.x branch: Prepare for 0.24.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-tools/misc/autopoint.in: Likewise. Accept version 0.24.1.
* gettext-tools/configure.ac (ARCHIVE_VERSION): Bump to 0.24.1.

diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index 9d201a01f37d227baaef81314bb23e399b89922e..b3569ac1efdc20980a5b178c2ac31ab1f46c0d5b 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 0x001800
+#define LIBINTL_VERSION 0x001801
 extern int libintl_version;
 
 

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index e930335b1181377918e829633f13e13ec52c9677..6dd7ad420a9b8ddad0367e224b1ade6b1c691e14 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -587,7 +587,7 @@ fi
 AC_SUBST([ARCHIVE_FORMAT])
 
 dnl Get versions of files brought in by autopull.sh.
-ARCHIVE_VERSION=0.24
+ARCHIVE_VERSION=0.24.1
 AC_SUBST([ARCHIVE_VERSION])
 dnl We don't offer a --with-tree-sitter-prefix option, but instead always use
 dnl the tree-sitter version included in the tarball. This is required because

diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h
index 22bc4866c56b459001001f31b5cb68ae8d025c51..329fd498198913853f3c08c7343e1ff88bc1b35d 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 0x001800
+#define LIBGETTEXTPO_VERSION 0x001801
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index a7ca199a9a132b374c3ff3d225d0a5c1d6105016..4f2bdb4d58e6ec19bb20d8e08c3f98dc57de57e0 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -393,7 +393,7 @@ case "$ver" in
   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.1 | \
-  0.24 )
+  0.24 | 0.24.1 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in

diff --git a/libtextstyle/version.sh b/libtextstyle/version.sh
index 9cd6e9718c9f545f7a358d6415a51e63743a9559..ce3295dd424969deeb9505590545026f7953e5bc 100644 (file)
--- a/libtextstyle/version.sh
+++ b/libtextstyle/version.sh
@@ -1,3 +1,3 @@
 # Version number and release date.
-VERSION_NUMBER=0.24
-RELEASE_DATE=2025-02-25      # in "date +%Y-%m-%d" format
+VERSION_NUMBER=0.24.1
+RELEASE_DATE=2025-05-02      # in "date +%Y-%m-%d" format