summaryrefslogtreecommitdiff
path: root/libc/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'libc/localedata')
-rw-r--r--libc/localedata/ChangeLog30
-rw-r--r--libc/localedata/Makefile25
-rw-r--r--libc/localedata/gen-locale.sh5
-rw-r--r--libc/localedata/locales/es_DO4
-rw-r--r--libc/localedata/locales/es_GT4
-rw-r--r--libc/localedata/locales/es_HN4
-rw-r--r--libc/localedata/locales/es_MX4
-rw-r--r--libc/localedata/locales/es_NI4
-rw-r--r--libc/localedata/locales/es_PA4
-rw-r--r--libc/localedata/locales/es_PR4
-rw-r--r--libc/localedata/locales/es_SV4
-rw-r--r--libc/localedata/sort-test.sh19
-rwxr-xr-xlibc/localedata/tst-ctype.sh5
-rwxr-xr-xlibc/localedata/tst-fmon.sh5
-rwxr-xr-xlibc/localedata/tst-langinfo.sh5
-rwxr-xr-xlibc/localedata/tst-locale.sh5
-rwxr-xr-xlibc/localedata/tst-mbswcs.sh5
-rw-r--r--libc/localedata/tst-numeric.sh5
-rwxr-xr-xlibc/localedata/tst-rpmatch.sh4
-rwxr-xr-xlibc/localedata/tst-trans.sh5
-rwxr-xr-xlibc/localedata/tst-wctype.sh5
21 files changed, 115 insertions, 40 deletions
diff --git a/libc/localedata/ChangeLog b/libc/localedata/ChangeLog
index 248b0092a..cd790c6e8 100644
--- a/libc/localedata/ChangeLog
+++ b/libc/localedata/ChangeLog
@@ -1,3 +1,33 @@
+2012-09-24 Dmitry V. Levin <ldv@altlinux.org>
+
+ * gen-locale.sh: Add "set -e".
+ * sort-test.sh: Likewise.
+ * tst-ctype.sh: Likewise.
+ * tst-fmon.sh: Likewise.
+ * tst-langinfo.sh: Likewise.
+ * tst-locale.sh: Likewise.
+ * tst-mbswcs.sh: Likewise.
+ * tst-numeric.sh: Likewise.
+ * tst-rpmatch.sh: Likewise.
+ * tst-trans.sh: Likewise.
+ * tst-wctype.sh: Likewise.
+ * Makefile: Do not specify -e option when running testsuite
+ shell scripts.
+
+ * sort-test.sh: Add copyright header.
+
+2012-09-05 Jeff Law <law@redhat.com>
+
+ [BZ#14510]
+ * locales/es_DO: Fix LC_NUMERIC decimal_point and thousands_sep.
+ * locales/es_GT: Likewise.
+ * locales/es_HN: Likewise.
+ * locales/es_MX: Likewise.
+ * locales/es_NI: Likewise.
+ * locales/es_PA: Likewise.
+ * locales/es_PR: Likewise.
+ * locales/es_SV: Likewise.
+
2012-06-20 Petr Baudis <pasky@ucw.cz>
* locales/mag_IN: Fix comment character.
diff --git a/libc/localedata/Makefile b/libc/localedata/Makefile
index 5e40e0fca..96079ce6a 100644
--- a/libc/localedata/Makefile
+++ b/libc/localedata/Makefile
@@ -1,5 +1,4 @@
-# Copyright (C) 1996-2003,2005,2007-2009,2011,2012
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -148,7 +147,7 @@ generated-dirs += $(LOCALES)
$(addprefix $(objpfx),$(CTYPE_FILES)): %: \
gen-locale.sh $(common-objpfx)locale/localedef Makefile \
$(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS))
- @$(SHELL) -e gen-locale.sh $(common-objpfx) \
+ @$(SHELL) gen-locale.sh $(common-objpfx) \
'$(if $(cross-localedef), \
$(cross-localedef), \
$(built-program-cmd))' \
@@ -169,45 +168,45 @@ endif
$(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
$(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
> $@
$(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
> $@
$(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
> $@
$(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
$(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
$(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
$(objpfx)tst-fmon.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
$(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
$(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
$(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
$(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
$(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
$(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
$(objpfx)sort-test.out tst-wctype.input \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
$(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
$(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
# eglibc: endif
diff --git a/libc/localedata/gen-locale.sh b/libc/localedata/gen-locale.sh
index 89a9e06ee..6dfa7caca 100644
--- a/libc/localedata/gen-locale.sh
+++ b/libc/localedata/gen-locale.sh
@@ -1,8 +1,7 @@
#! /bin/sh
# Generate test locale files.
-# Copyright (C) 2000,01,02 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx="$1"; shift
localedef="$1"; shift
locfile="$1"; shift
diff --git a/libc/localedata/locales/es_DO b/libc/localedata/locales/es_DO
index 7cf54cf3a..4753ecfdd 100644
--- a/libc/localedata/locales/es_DO
+++ b/libc/localedata/locales/es_DO
@@ -78,7 +78,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_GT b/libc/localedata/locales/es_GT
index 49d369f74..0889d44c4 100644
--- a/libc/localedata/locales/es_GT
+++ b/libc/localedata/locales/es_GT
@@ -77,7 +77,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_HN b/libc/localedata/locales/es_HN
index a80918846..febab6bbe 100644
--- a/libc/localedata/locales/es_HN
+++ b/libc/localedata/locales/es_HN
@@ -78,7 +78,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_MX b/libc/localedata/locales/es_MX
index 7a1cccc96..a201f0bbb 100644
--- a/libc/localedata/locales/es_MX
+++ b/libc/localedata/locales/es_MX
@@ -78,7 +78,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U2009>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_NI b/libc/localedata/locales/es_NI
index 737153207..384ebaa07 100644
--- a/libc/localedata/locales/es_NI
+++ b/libc/localedata/locales/es_NI
@@ -69,7 +69,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_PA b/libc/localedata/locales/es_PA
index ae5cd3a4f..7f22166f3 100644
--- a/libc/localedata/locales/es_PA
+++ b/libc/localedata/locales/es_PA
@@ -78,7 +78,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002c>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_PR b/libc/localedata/locales/es_PR
index b15ca4522..93d7d21c2 100644
--- a/libc/localedata/locales/es_PR
+++ b/libc/localedata/locales/es_PR
@@ -69,7 +69,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/locales/es_SV b/libc/localedata/locales/es_SV
index d99b6cff6..fa5e5805c 100644
--- a/libc/localedata/locales/es_SV
+++ b/libc/localedata/locales/es_SV
@@ -78,7 +78,9 @@ n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
-copy "es_ES"
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
diff --git a/libc/localedata/sort-test.sh b/libc/localedata/sort-test.sh
index 67de72eef..8f8be8f67 100644
--- a/libc/localedata/sort-test.sh
+++ b/libc/localedata/sort-test.sh
@@ -1,4 +1,23 @@
#! /bin/sh
+# Test collation using xfrm-test.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+set -e
common_objpfx=$1; shift
run_program_prefix=$1; shift
diff --git a/libc/localedata/tst-ctype.sh b/libc/localedata/tst-ctype.sh
index 61f8cae62..16420a89b 100755
--- a/libc/localedata/tst-ctype.sh
+++ b/libc/localedata/tst-ctype.sh
@@ -1,8 +1,7 @@
#! /bin/sh
# Testing the implementation of the isxxx() and toxxx() functions.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1; shift
tst_ctype=$1; shift
status=0
diff --git a/libc/localedata/tst-fmon.sh b/libc/localedata/tst-fmon.sh
index fc0110a6a..7e6d7f1d6 100755
--- a/libc/localedata/tst-fmon.sh
+++ b/libc/localedata/tst-fmon.sh
@@ -1,9 +1,8 @@
#! /bin/sh
# Testing the implementation of strfmon(3).
-# Copyright (C) 1996-1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -19,6 +18,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1
run_program_prefix=$2
datafile=$3
diff --git a/libc/localedata/tst-langinfo.sh b/libc/localedata/tst-langinfo.sh
index 567361c23..04771cb02 100755
--- a/libc/localedata/tst-langinfo.sh
+++ b/libc/localedata/tst-langinfo.sh
@@ -1,8 +1,7 @@
#! /bin/sh
# Test nl_langinfo.
-# Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1
run_program_prefix=$2
diff --git a/libc/localedata/tst-locale.sh b/libc/localedata/tst-locale.sh
index 96c26a750..96eddc118 100755
--- a/libc/localedata/tst-locale.sh
+++ b/libc/localedata/tst-locale.sh
@@ -1,9 +1,8 @@
#! /bin/sh
# Testing the implementation of localedata.
-# Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Andreas Jaeger, <aj@arthur.rhein-neckar.de>, 1998.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -19,6 +18,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1; shift
localedef=$1; shift
diff --git a/libc/localedata/tst-mbswcs.sh b/libc/localedata/tst-mbswcs.sh
index 30667890c..5a067ec0d 100755
--- a/libc/localedata/tst-mbswcs.sh
+++ b/libc/localedata/tst-mbswcs.sh
@@ -1,8 +1,7 @@
#! /bin/sh
# Testing the implementation of the mb*towc*() and wc*tomb*() functions.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1; shift
run_program_prefix=$1; shift
diff --git a/libc/localedata/tst-numeric.sh b/libc/localedata/tst-numeric.sh
index ca4b4fe25..a6758477e 100644
--- a/libc/localedata/tst-numeric.sh
+++ b/libc/localedata/tst-numeric.sh
@@ -1,9 +1,8 @@
#! /bin/sh
# Testing the implementation of LC_NUMERIC and snprintf(3).
-# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -19,6 +18,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1
run_program_prefix=$2
datafile=$3
diff --git a/libc/localedata/tst-rpmatch.sh b/libc/localedata/tst-rpmatch.sh
index c5e905ef3..b71416e91 100755
--- a/libc/localedata/tst-rpmatch.sh
+++ b/libc/localedata/tst-rpmatch.sh
@@ -1,6 +1,6 @@
#! /bin/sh -f
#
-# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library and contains tests for
# the rpmatch(3)-implementation.
# contributed by Jochen Hein <jochen.hein@delphi.central.de>
@@ -18,6 +18,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1
tst_rpmatch=$2
diff --git a/libc/localedata/tst-trans.sh b/libc/localedata/tst-trans.sh
index 5155a3585..e90b653ed 100755
--- a/libc/localedata/tst-trans.sh
+++ b/libc/localedata/tst-trans.sh
@@ -1,8 +1,7 @@
#! /bin/sh
# Test character mapping definitions.
-# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1
run_program_prefix=$2
diff --git a/libc/localedata/tst-wctype.sh b/libc/localedata/tst-wctype.sh
index 027fd8267..8cb34b857 100755
--- a/libc/localedata/tst-wctype.sh
+++ b/libc/localedata/tst-wctype.sh
@@ -1,8 +1,7 @@
#! /bin/sh
# Test locale-define character classes.
-# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
common_objpfx=$1
tst_wctype=$2
View Lorry Controller Status