Merge from 0.22.x branch: Prepare for 0.22.1 release.

* gettext-runtime/intl/Makefile.am (LTV_*): Bump to 12:0:4.
* gettext-runtime/intl/libgnuintl.in.h (LIBINTL_VERSION): Bump.
* gettext-tools/libgettextpo/gettext-po.in.h (LIBGETTEXTPO_VERSION): Bump.
* libtextstyle/version.sh: Update VERSION_NUMBER, RELEASE_DATE.
* libtextstyle/lib/Makefile.am (LTV_*): Bump to 2:1:2.
* gettext-tools/libgettextpo/Makefile.am (LTV_*): Bump to 5:10:5.
* gettext-tools/configure.ac (ARCHIVE_VERSION): Bump to 0.22.1.
* gettext-tools/misc/autopoint.in: Allow version 0.22.1.

diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
index 15d726b32dd7f36901f13d97caba5af8faee3107..32b26b46b26a71dd57a6578af1d588e1ba6f50d5 100644 (file)
--- a/gettext-runtime/intl/Makefile.am
+++ b/gettext-runtime/intl/Makefile.am
@@ -443,9 +443,9 @@ endif
 # Libtool's library version information for libintl.
 # Before making a gettext release, you must change this according to the
 # libtool documentation, section "Library interface versions".
-LTV_CURRENT=11
+LTV_CURRENT=12
 LTV_REVISION=0
-LTV_AGE=3
+LTV_AGE=4
 
 # How to build libintl.la and libgnuintl.la.
 # Limit the exported symbols: Don't export _libintl_* (from gnulib modules).

diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index f551c94e64b94053f6b2a7e1c5df8eb8fff6ddae..cb7168573ad8d0aaba58b03e69682f95500c9e4d 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 0x001600
+#define LIBINTL_VERSION 0x001601
 extern int libintl_version;
 
 

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 1506d816027974b1b991672dc14ad1cabd4a7935..d02f2e3b03750425d1c7843b2bdf7e4b376a6830 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -511,7 +511,7 @@ changequote([,])dnl
 fi
 AC_SUBST([ARCHIVE_FORMAT])
 
-ARCHIVE_VERSION=0.22
+ARCHIVE_VERSION=0.22.1
 AC_SUBST([ARCHIVE_VERSION])
 
 PACKAGE_SUFFIX="-$ARCHIVE_VERSION"

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 8b0751b637f5b2c2365a47d800ded54d02e430e0..5fc670807931981c51e306cdec758baa49d9c15a 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -106,7 +106,7 @@ libgettextpo_la_AUXSOURCES = \
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=5
-LTV_REVISION=9
+LTV_REVISION=10
 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 b69b6606be9590061cc1d1e8c07b53b1e0f85ef7..07a858ca2ddb55969da92a2dc5e0b89ef950c372 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 0x001600
+#define LIBGETTEXTPO_VERSION 0x001601
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 3b0753da6b8812acf476c315e72b1da30c2a2347..2fa35743f07c82798b5b9a6f896bc4956876910a 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -391,7 +391,7 @@ case "$ver" in
   0.19 | 0.19.1 | 0.19.2 | 0.19.3 | 0.19.4 | 0.19.5 | 0.19.6 | 0.19.7 | 0.19.8 | \
   0.20 | 0.20.2 | \
   0.21 | 0.21.1 | \
-  0.22 )
+  0.22 | 0.22.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 b0fd3851a6e3dc723805b924da5ca8ee104aaa86..c7079e3b488d04d81e47c03726960263f6adb2d3 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=0
+LTV_REVISION=1
 LTV_AGE=2
 
 # How to build libtextstyle.la.

diff --git a/libtextstyle/version.sh b/libtextstyle/version.sh
index 4c771ccb2616394812e164280b389c1f8a8da3cf..6d359640c7d7711d623c9958810f9af5231c5f30 100644 (file)
--- a/libtextstyle/version.sh
+++ b/libtextstyle/version.sh
@@ -1,3 +1,3 @@
 # Version number and release date.
-VERSION_NUMBER=0.22
-RELEASE_DATE=2023-06-17      # in "date +%Y-%m-%d" format
+VERSION_NUMBER=0.22.1
+RELEASE_DATE=2023-09-19      # in "date +%Y-%m-%d" format