From: Bruno Haible Date: Wed, 7 May 2025 13:06:24 +0000 (+0200) Subject: Prepare for 0.25 release. X-Git-Tag: v0.25~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbe56ffe46f73c9c945bc49a8d19911a9acd34ea;p=thirdparty%2Fgettext.git Prepare for 0.25 release. * gettext-runtime/doc/matrix.texi: Update from TP. * gettext-runtime/doc/nls.texi (STATUS): Update. * 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/po/Makefile.in.in: Update Origin. * gettext-runtime/intl/Makefile.am (LTV_*): Bump to 12:4:4. * libtextstyle/lib/Makefile.am (LTV_*): Bump to 2:5:2. * gettext-tools/libgettextpo/Makefile.am (LTV_*): Bump to 5:14:5. * gettext-tools/misc/autopoint.in: Likewise. Accept version 0.25. * gettext-tools/configure.ac (ARCHIVE_VERSION): Bump to 0.25. --- diff --git a/gettext-runtime/doc/matrix.texi b/gettext-runtime/doc/matrix.texi index 82efcb7f2..f894e3bcd 100644 --- a/gettext-runtime/doc/matrix.texi +++ b/gettext-runtime/doc/matrix.texi @@ -8,8 +8,8 @@ aspell | [] [] [] [] [] | bash | [] [] [] | beebase | | bfd | | -binutils | | -bison | [] | +binutils | [] | +bison | [] [] | bison-runtime | [] [] [] [] | buzztrax | [] [] | ccd2cue | [] | @@ -155,13 +155,13 @@ xz | [] | xz-man | | +-------------------------------------------------+ ab af an ar ast be bg bn bn_IN ca ckb crh cs da - 1 3 2 6 15 14 31 1 1 50 1 1 62 95 + 1 3 2 6 15 14 31 1 1 52 1 1 62 95 @end group @group de el en en_GB eo es et eu fa fi fr fur ga gd +--------------------------------------------------+ -a2ps | [] [] [] [] | +a2ps | [] [] [] [] [] | anubis | [] [] [] [] | aspell | [] [] [] [] [] [] [] [] | bash | [] [] [] [] [] | @@ -179,7 +179,7 @@ clisp | [] [] [] [] | coreutils | [] [] [] [] | cpio | [] [] [] [] [] | cppi | [] [] [] [] [] | -cpplib | | +cpplib | [] [] | cryptsetup | [] [] [] | datamash | [] [] [] [] | denemo | | @@ -210,7 +210,7 @@ gettext-runtime | [] [] [] [] [] [] | gettext-tools | [] [] [] [] | gnubik | [] [] [] [] [] [] | gnuchess | [] [] [] [] | -gnucobol | [] | +gnucobol | [] [] | gnulib | [] [] [] [] [] | gnunet | [] | gnunet-gtk | [] [] | @@ -314,7 +314,7 @@ xz | [] [] [] [] | xz-man | [] [] | +--------------------------------------------------+ de el en en_GB eo es et eu fa fi fr fur ga gd - 129 23 1 5 81 121 18 8 5 74 141 25 26 2 + 131 23 1 5 81 121 19 8 5 74 142 25 26 2 @end group @group @@ -323,7 +323,7 @@ xz-man | [] [] | a2ps | [] [] [] [] | anubis | [] [] [] [] | aspell | [] [] [] [] [] | -bash | [] [] [] [] [] | +bash | [] [] [] | beebase | () | bfd | | binutils | | @@ -379,7 +379,7 @@ gphoto2 | [] [] [] [] [] [] | gprof | [] [] [] [] | grep | [] [] [] [] [] [] [] [] | grip | [] [] [] [] | -grub | [] [] [] [] [] [] [] | +grub | [] [] [] [] [] [] [] [] | gsasl | [] [] [] [] | gss | [] [] [] [] [] | gst-plugins-bad | [] [] [] [] [] | @@ -394,7 +394,7 @@ gutenprint | [] [] [] [] [] | hello | [] [] | help2man | [] [] [] [] | help2man-texi | | -i18nparse | | +i18nparse | [] | idutils | [] [] [] | kbd | [] | klavaro | [] [] [] [] [] [] | @@ -410,11 +410,11 @@ libidn2 | [] [] [] [] | lilypond | [] [] | lordsawar | [] | lynx | [] [] [] [] | -m4 | [] [] | +m4 | [] | mailfromd | | mailutils | | make | [] [] [] [] [] | -man-db | [] [] [] | +man-db | [] [] [] [] | man-db-manpages | [] [] | meritous | | midi-instruments | [] [] [] [] [] [] [] [] [] [] [] [] | @@ -469,11 +469,11 @@ wyslij-po | [] [] [] [] | xboard | | xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] | xkeyboard-config | [] [] [] [] [] [] [] [] | -xz | [] [] [] [] | +xz | [] [] [] [] [] | xz-man | [] [] | +-------------------------------------------------+ gl gu he hi hr hu hy id is it ja ka kk kn ko ku - 30 1 10 1 58 62 2 59 7 63 46 44 2 1 45 3 + 30 1 10 1 58 62 2 59 7 65 45 44 2 1 45 3 @end group @group @@ -642,8 +642,8 @@ a2ps | [] [] [] [] [] | anubis | [] [] [] [] [] [] | aspell | [] [] [] [] [] [] [] [] [] [] | bash | [] [] [] [] [] [] | -beebase | [] [] | -bfd | [] [] [] [] | +beebase | [] [] [] | +bfd | [] [] [] [] [] | binutils | [] [] [] [] [] | bison | [] [] [] [] [] | bison-runtime | [] [] [] [] [] [] [] [] [] [] | @@ -656,7 +656,7 @@ clisp | [] [] [] | coreutils | [] [] [] [] [] [] [] [] | cpio | [] [] [] [] [] [] [] | cppi | [] [] [] [] [] | -cpplib | [] | +cpplib | [] [] | cryptsetup | [] [] [] [] [] | datamash | [] [] [] [] | denemo | | @@ -685,7 +685,7 @@ gdbm | [] [] [] [] [] [] | gettext-examples | [] [] [] [] [] [] [] [] [] [] [] | gettext-runtime | [] [] [] [] [] [] [] [] [] | gettext-tools | [] [] [] [] [] [] [] [] [] | -gnubik | [] [] [] [] [] [] | +gnubik | [] [] [] [] [] [] [] | gnuchess | [] [] [] [] | gnucobol | [] | gnulib | [] [] [] [] [] [] [] | @@ -706,10 +706,10 @@ gst-plugins-good | [] [] [] [] [] [] [] [] | gst-plugins-ugly | [] [] [] [] [] [] [] [] [] [] | gstreamer | [] [] [] [] [] [] [] [] | gtick | [] [] [] [] [] [] [] | -gtkam | [] [] [] [] [] [] [] | +gtkam | [] [] [] [] [] [] [] [] | gtkspell | [] [] [] [] [] [] [] [] [] [] [] | gutenprint | [] [] [] [] [] | -hello | [] [] [] [] [] [] [] [] | +hello | [] [] [] [] [] [] [] [] [] | help2man | [] [] [] [] [] [] | help2man-texi | [] [] [] [] [] | i18nparse | [] [] [] [] | @@ -728,7 +728,7 @@ libidn2 | [] [] [] [] [] [] | lilypond | [] [] | lordsawar | [] [] | lynx | [] [] [] [] | -m4 | [] [] [] [] | +m4 | [] [] [] [] [] | mailfromd | [] [] [] [] | mailutils | [] [] [] [] | make | [] [] [] [] [] [] [] | @@ -741,7 +741,7 @@ mpop | [] [] [] [] [] | msmtp | [] [] [] [] [] | nano | [] [] [] [] [] [] [] [] [] | opcodes | [] [] [] [] | -parted | [] [] [] [] [] [] [] [] | +parted | [] [] [] [] [] [] [] [] [] | pies | [] [] [] [] | procps-ng | [] [] [] [] | procps-ng-man | [] [] | @@ -761,21 +761,21 @@ shepherd | [] [] [] [] | shishi | [] [] [] [] | skribilo | [] [] [] [] | solfege | [] [] [] [] [] [] | -solfege-manual | [] [] [] | +solfege-manual | [] [] [] [] | sudo | [] [] [] [] [] [] [] | sudoers | [] [] [] [] [] [] [] | sysstat | [] [] [] [] [] [] | tar | [] [] [] [] [] [] [] [] | texinfo | [] [] [] [] [] [] [] [] | -texinfo_document | [] [] [] [] [] [] | +texinfo_document | [] [] [] [] [] [] [] | tigervnc | [] [] [] [] [] | tin | [] | tin-man | | trader | [] [] [] [] [] | util-linux | [] [] [] [] [] [] | -util-linux-man | [] [] | +util-linux-man | [] [] [] | vmm | [] [] | -vorbis-tools | [] [] [] [] [] | +vorbis-tools | [] [] [] [] [] [] | wastesedge | [] [] | wcd | [] [] [] [] | wcd-man | [] [] [] [] | @@ -787,24 +787,24 @@ wyslij-po | [] [] [] [] [] | xboard | [] [] [] [] [] | xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] | xkeyboard-config | [] [] [] [] [] [] [] [] [] | -xz | [] [] [] [] [] | +xz | [] [] [] [] [] [] | xz-man | [] [] [] | +-------------------------------------------------+ pl pt pt_BR ro ru rw sk sl sq sr sv sw ta te - 97 43 112 135 85 0 37 32 11 130 127 1 8 1 + 99 49 113 135 85 0 37 32 11 130 131 1 8 1 @end group @group tg th tr uk ur vi wa wo zh_CN zh_HK zh_TW +--------------------------------------------+ -a2ps | [] [] | 19 +a2ps | [] [] | 20 anubis | [] [] [] | 21 aspell | [] [] [] [] | 34 -bash | [] [] [] [] [] | 26 -beebase | [] | 7 -bfd | [] | 7 -binutils | [] | 7 -bison | [] [] | 17 +bash | [] [] [] [] | 23 +beebase | [] | 8 +bfd | [] | 8 +binutils | [] | 8 +bison | [] [] | 18 bison-runtime | [] [] [] [] [] [] | 41 buzztrax | [] [] | 12 ccd2cue | [] [] [] [] | 14 @@ -815,7 +815,7 @@ clisp | | 13 coreutils | [] [] [] [] [] | 27 cpio | [] [] [] [] | 25 cppi | [] [] [] | 20 -cpplib | [] [] | 3 +cpplib | [] [] | 6 cryptsetup | [] [] | 13 datamash | [] | 12 denemo | [] [] [] | 7 @@ -844,9 +844,9 @@ gdbm | [] [] | 13 gettext-examples | [] [] [] [] [] [] | 44 gettext-runtime | [] [] [] [] [] | 34 gettext-tools | [] [] [] [] [] | 26 -gnubik | [] [] [] | 23 +gnubik | [] [] [] | 24 gnuchess | [] [] [] | 15 -gnucobol | | 2 +gnucobol | | 3 gnulib | [] [] [] | 19 gnunet | | 2 gnunet-gtk | | 3 @@ -856,7 +856,7 @@ gphoto2 | [] [] [] [] | 21 gprof | [] [] [] | 22 grep | [] [] [] [] [] [] | 38 grip | [] [] [] [] [] | 25 -grub | [] [] [] [] | 30 +grub | [] [] [] [] | 31 gsasl | [] [] [] | 21 gss | [] [] | 20 gst-plugins-bad | [] [] [] [] [] | 30 @@ -865,13 +865,13 @@ gst-plugins-good | [] [] [] [] [] | 34 gst-plugins-ugly | [] [] [] [] [] | 40 gstreamer | [] [] [] [] [] | 35 gtick | [] [] [] | 23 -gtkam | [] [] [] | 26 +gtkam | [] [] [] | 27 gtkspell | [] [] [] [] [] [] [] [] | 51 gutenprint | [] [] [] | 19 -hello | [] [] [] | 22 +hello | [] [] [] | 23 help2man | [] [] [] | 21 help2man-texi | [] | 9 -i18nparse | [] | 9 +i18nparse | [] | 10 idutils | [] [] [] | 21 kbd | [] | 15 klavaro | [] [] [] [] [] [] | 36 @@ -891,7 +891,7 @@ m4 | [] [] | 14 mailfromd | [] [] | 9 mailutils | [] [] | 10 make | [] [] [] [] | 25 -man-db | [] [] [] [] [] | 24 +man-db | [] [] [] [] [] | 25 man-db-manpages | [] [] [] | 15 meritous | | 6 midi-instruments | [] [] [] [] [] [] | 44 @@ -900,7 +900,7 @@ mpop | [] | 10 msmtp | [] | 10 nano | [] [] [] [] [] | 34 opcodes | [] | 7 -parted | [] [] [] [] [] | 26 +parted | [] [] [] [] [] | 27 pies | [] [] | 9 procps-ng | [] [] [] | 11 procps-ng-man | [] [] | 4 @@ -920,21 +920,21 @@ shepherd | [] | 6 shishi | [] [] | 9 skribilo | [] | 11 solfege | [] [] [] | 23 -solfege-manual | [] | 11 +solfege-manual | [] | 12 sudo | [] [] [] [] [] | 32 sudoers | [] [] [] | 22 sysstat | [] [] [] [] | 24 tar | [] [] [] [] [] | 33 texinfo | [] [] [] | 22 -texinfo_document | [] | 12 +texinfo_document | [] | 13 tigervnc | [] [] [] [] | 20 tin | [] [] [] | 8 tin-man | | 2 trader | | 14 -util-linux | [] [] [] [] | 19 -util-linux-man | [] | 5 +util-linux | [] [] [] | 18 +util-linux-man | [] | 6 vmm | [] | 3 -vorbis-tools | [] | 16 +vorbis-tools | [] | 17 wastesedge | [] | 7 wcd | [] [] [] | 15 wcd-man | [] | 8 @@ -946,10 +946,10 @@ wyslij-po | [] [] [] | 20 xboard | [] [] [] | 13 xdg-user-dirs | [] [] [] [] [] [] [] [] | 72 xkeyboard-config | [] [] [] | 33 -xz | [] [] [] [] [] | 20 +xz | [] [] [] [] [] | 22 xz-man | [] | 8 +--------------------------------------------+ 85 teams tg th tr uk ur vi wa wo zh_CN zh_HK zh_TW - 151 domains 0 11 53 125 1 88 5 1 90 5 42 2822 + 151 domains 0 11 52 125 1 87 5 1 90 5 42 2840 @end group @end example diff --git a/gettext-runtime/doc/nls.texi b/gettext-runtime/doc/nls.texi index dbf66f06a..5652f859b 100644 --- a/gettext-runtime/doc/nls.texi +++ b/gettext-runtime/doc/nls.texi @@ -12,7 +12,7 @@ as a file named @code{ABOUT-NLS}. @strong{ NOTE: } This documentation section is outdated. It it included here for historical purposes only. -@set STATUS February 2025 +@set STATUS May 2025 Free software is going international! The Free Translation Project is a way to get maintainers of free software, translators, and users all diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am index f39c10cb8..6ed35ead3 100644 --- a/gettext-runtime/intl/Makefile.am +++ b/gettext-runtime/intl/Makefile.am @@ -441,7 +441,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=3 +LTV_REVISION=4 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 b3569ac1e..eedb9f74f 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 0x001801 +#define LIBINTL_VERSION 0x001900 extern int libintl_version; diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index 7b8b00e15..4651c6a9c 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper -# Copyright (C) 2000-2024 Free Software Foundation, Inc. +# Copyright (C) 2000-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.24 +# Origin: gettext-0.25 GETTEXT_MACRO_VERSION = 0.24 # This Makefile makes use of the variable assignment operator != standardized diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 4a08a4af4..867190217 100644 --- 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.1 +ARCHIVE_VERSION=0.25 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/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index 8dc18f6a1..559c0e91d 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -109,7 +109,7 @@ libgettextpo_la_AUXSOURCES = \ # Libtool's library version information for libgettextpo. # See the libtool documentation, section "Library interface versions". LTV_CURRENT=5 -LTV_REVISION=13 +LTV_REVISION=14 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 329fd4981..fec8204e2 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 0x001801 +#define LIBGETTEXTPO_VERSION 0x001900 extern int libgettextpo_version; /* ================================= Types ================================= */ diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index 4f2bdb4d5..451b31396 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -393,7 +393,8 @@ 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.1 ) + 0.24 | 0.24.1 | \ + 0.25 ) ;; *) 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 582ab2d04..580b71d40 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=4 +LTV_REVISION=5 LTV_AGE=2 # How to build libtextstyle.la. diff --git a/libtextstyle/version.sh b/libtextstyle/version.sh index ce3295dd4..219ae51cb 100644 --- a/libtextstyle/version.sh +++ b/libtextstyle/version.sh @@ -1,3 +1,3 @@ # Version number and release date. -VERSION_NUMBER=0.24.1 -RELEASE_DATE=2025-05-02 # in "date +%Y-%m-%d" format +VERSION_NUMBER=0.25 +RELEASE_DATE=2025-05-07 # in "date +%Y-%m-%d" format