From 90241a2024d430ab2a1706513e596621222588a5 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 2 Oct 2007 17:19:53 +0000
Subject: * string/strcoll_l.c (STRCOLL): Correct test for alloca use.

---
 ChangeLog            |  2 ++
 localedata/ChangeLog |  3 ++
 localedata/Makefile  |  4 +--
 localedata/fr_FR.in  | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 localedata/fr_FR.in

diff --git a/ChangeLog b/ChangeLog
index 028a126b6c..4339ef4d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-10-02  Ulrich Drepper  <drepper@redhat.com>
 
+	* string/strcoll_l.c (STRCOLL): Correct test for alloca use.
+
 	[BZ #645]
 	* locale/programs/ld-collate.c (collate_finish): Compare against last
 	used section which is known to have rules defined.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 376ad87c70..4734dc37a0 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -2,6 +2,9 @@
 
 	* de_DE.in: Adjust for correct handling of backward direction sorting.
 
+	* fr_FR.in: New file.
+	* Makefile: Add rules to run fr_FR sorting test.
+
 2007-10-01  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #4941]
diff --git a/localedata/Makefile b/localedata/Makefile
index 0d80a7879a..024da6aa58 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -41,7 +41,7 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
 	     tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
 	     tst-ctype tst-wctype tst-langinfo tst-numeric
 test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
-	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8
+	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8
 test-input-data = $(addsuffix .in, $(basename $(test-input)))
 test-output := $(foreach s, .out .xout, \
 			 $(addsuffix $s, $(basename $(test-input))))
@@ -133,7 +133,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
 	   vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \
-	   tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8
+	   tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
 		    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)
diff --git a/localedata/fr_FR.in b/localedata/fr_FR.in
new file mode 100644
index 0000000000..dd5c5330d5
--- /dev/null
+++ b/localedata/fr_FR.in
@@ -0,0 +1,96 @@
+@@@@@
+0000
+9999
+Aalborg
+aide
+aïeul
+air
+@@@air
+air@@@
+Ålborg
+août
+bohème
+Bohême
+Bohémien
+caennais
+cæsium
+çà et là
+C.A.F.
+Canon
+cañon
+casanier
+cølibat
+colon
+côlon
+coop
+co-op
+COOP
+CO-OP
+Copenhagen
+cote
+COTE
+côte
+CÔTE
+coté
+COTÉ
+côté
+CÔTÉ
+du
+dû
+élève
+élevé
+gène
+gêne
+gêné
+Größe
+Grossist
+haie
+haïe
+île
+Île d'Orléans
+lame
+l'âme
+lamé
+les
+LÈS
+lèse
+lésé
+L'Haÿ-les-Roses
+MÂCON
+maçon
+McArthur
+Mc Arthur
+Mc Mahon
+MODÈLE
+modelé
+Noël
+NOËL
+notre
+nôtre
+ode
+œil
+ou
+OÙ
+ovoïde
+pèche
+pêche
+péché
+PÉCHÉ
+pêché
+pécher
+pêcher
+pechère
+péchère
+relève
+relevé
+resume
+resumé
+résumé
+révèle
+révélé
+vice-president
+vice-président
+vice-president's offices
+vice-presidents' offices
+vice versa
+VICE-VERSA
-- 
cgit 1.4.1