From: Bruno Haible Date: Tue, 11 Jan 2005 12:55:54 +0000 (+0000) Subject: Next release will be 0.14.2. X-Git-Tag: v0.14.2~195 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d2bba3d19a5f6f1de3e010e906f94878219b6ed;p=thirdparty%2Fgettext.git Next release will be 0.14.2. --- diff --git a/ChangeLog b/ChangeLog index 2fb4d27df..3c3d2b6e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-05 Bruno Haible + + * version.sh: Bump version number to 0.14.2-pre1. + 2005-01-05 Bruno Haible * config/ltmain.sh: Upgrade to libtool-1.5.10. diff --git a/NEWS b/NEWS index 47dc2ce70..9c4eb6cd3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Version 0.15 - September 2004 +Version 0.14.2 - January 2005 * Improved detection of the locale on MacOS X. diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4 index 20cc7fb50..b0ae4d2a0 100644 --- a/autoconf-lib-link/m4/lib-link.m4 +++ b/autoconf-lib-link/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2004 Free Software Foundation, Inc. +# lib-link.m4 serial 5 (gettext-0.14.2) +dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/autoconf-lib-link/m4/lib-prefix.m4 b/autoconf-lib-link/m4/lib-prefix.m4 index acbd7126e..8744934e9 100644 --- a/autoconf-lib-link/m4/lib-prefix.m4 +++ b/autoconf-lib-link/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 4 (gettext-0.15) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +# lib-prefix.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/gettext-runtime/NEWS b/gettext-runtime/NEWS index 633f565df..9f1d109a7 100644 --- a/gettext-runtime/NEWS +++ b/gettext-runtime/NEWS @@ -1,4 +1,4 @@ -Version 0.15 - September 2004 +Version 0.14.2 - January 2005 * Improved detection of the locale on MacOS X. diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index d27e52ab2..fd0940b58 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 32 (gettext-0.15) -dnl Copyright (C) 1995-2004 Free Software Foundation, Inc. +# gettext.m4 serial 32 (gettext-0.14.2) +dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/gettext-runtime/m4/intmax.m4 b/gettext-runtime/m4/intmax.m4 index eef946ad0..5626b1ef6 100644 --- a/gettext-runtime/m4/intmax.m4 +++ b/gettext-runtime/m4/intmax.m4 @@ -1,5 +1,5 @@ -# intmax.m4 serial 2 (gettext-0.15) -dnl Copyright (C) 2002-2004 Free Software Foundation, Inc. +# intmax.m4 serial 2 (gettext-0.14.2) +dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/gettext-runtime/m4/lcmessage.m4 b/gettext-runtime/m4/lcmessage.m4 index 6e06e438e..bf04a462f 100644 --- a/gettext-runtime/m4/lcmessage.m4 +++ b/gettext-runtime/m4/lcmessage.m4 @@ -1,5 +1,5 @@ -# lcmessage.m4 serial 4 (gettext-0.15) -dnl Copyright (C) 1995-2002, 2004 Free Software Foundation, Inc. +# lcmessage.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index e16199881..c446386ad 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 3 (gettext-0.14) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +# po.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -348,7 +348,7 @@ changequote([,])dnl QMFILES="$QMFILES $srcdirpre$lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g'` + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" done # CATALOGS depends on both $ac_dir and the user's LINGUAS @@ -389,7 +389,7 @@ changequote([,])dnl QTCATALOGS="$QTCATALOGS $lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g'` + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" done fi @@ -409,7 +409,7 @@ EOF if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g'` + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` cat >> "$ac_file.tmp" <