Next release will be 0.14.2.

diff --git a/ChangeLog b/ChangeLog
index 2fb4d27df89e7d789b9364dde72c93be363a369e..3c3d2b6e8f0502f6e932f350ac716c897d204e5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-05  Bruno Haible  <bruno@clisp.org>
+
+       * version.sh: Bump version number to 0.14.2-pre1.
+
 2005-01-05  Bruno Haible  <bruno@clisp.org>
 
        * config/ltmain.sh: Upgrade to libtool-1.5.10.

diff --git a/NEWS b/NEWS
index 47dc2ce7064df15635138e05aa4c55c18b9b3759..9c4eb6cd307996653057c74e45c66544dc891db9 100644 (file)
--- 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.
 \f

diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4
index 20cc7fb5079bd9b39e1c98d7562feef3b4e7d3e2..b0ae4d2a0392da21010931f83dc2e44b0e3535d5 100644 (file)
--- 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 acbd7126ebd64b49acb7b175053c01367ed77088..8744934e94a1574d94f862cc0e26dfac683ccc24 100644 (file)
--- 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 633f565df272d5671afb8cddb448a313bce6bee0..9f1d109a77052a3a4b18873833ea25d232efa86a 100644 (file)
--- 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.
 \f

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index d27e52ab2b53955467e5d7ff6b4c9f58bb2666d7..fd0940b582e27512aadf2ff3be5ad2f29c176395 100644 (file)
--- 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 eef946ad015b4f0ba01836a5a8bdb03c23728f4a..5626b1ef666f7aaa5cf1792158658005b9549f72 100644 (file)
--- 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 6e06e438e6e9e96c4909704fd93c8cb191219565..bf04a462f569cad741168deb3f9ddf7188e09bb6 100644 (file)
--- 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 e1619988187071bc80ab6a93cd1f67d361480176..c446386ad958ed297672c952d77e4cd4b773ba0a 100644 (file)
--- 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" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
        @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \

diff --git a/gettext-tools/m4/csharp.m4 b/gettext-tools/m4/csharp.m4
index 58a75f9bd4484f931c7c60091875807ddb8f4fb2..748750e197fed6163279ea788b1eb7fdaf7b021a 100644 (file)
--- a/gettext-tools/m4/csharp.m4
+++ b/gettext-tools/m4/csharp.m4
@@ -1,5 +1,5 @@
-# csharp.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+# csharp.m4 serial 2 (gettext-0.14.2)
+dnl Copyright (C) 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-tools/m4/csharpcomp.m4 b/gettext-tools/m4/csharpcomp.m4
index 7aed983930cc57192e9d666f782b904ec2f8aee0..132cc4987288098b17d171b034da560af3000d35 100644 (file)
--- a/gettext-tools/m4/csharpcomp.m4
+++ b/gettext-tools/m4/csharpcomp.m4
@@ -1,5 +1,5 @@
-# csharpcomp.m4 serial 4 (gettext-0.15)
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+# csharpcomp.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2003-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-tools/m4/error.m4 b/gettext-tools/m4/error.m4
index c8039f41d1e8381b240523252290d25fa0a09e83..caeb47d1d4c76ebce0e06f6cbf6e144af1192092 100644 (file)
--- a/gettext-tools/m4/error.m4
+++ b/gettext-tools/m4/error.m4
@@ -1,5 +1,5 @@
-# error.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# error.m4 serial 3 (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/version.sh b/version.sh
index 24481d1d17e3066c00722c3d8f46878f5ea0cf27..d7f932f91bfe591ed8e1f12784a125006a59f3c6 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -1,3 +1,3 @@
 # Version number and release date.
-VERSION_NUMBER=0.14.1
-RELEASE_DATE=2004-01-29      # in "date +%Y-%m-%d" format
+VERSION_NUMBER=0.14.2-pre1
+RELEASE_DATE=2005-01-05      # in "date +%Y-%m-%d" format