r1107 - in glibc-package/trunk/debian: . patches patches/localedata
Author: barbier
Date: 2006-01-15 17:25:40 +0000 (Sun, 15 Jan 2006)
New Revision: 1107
Added:
glibc-package/trunk/debian/patches/localedata/locales-fr.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* debian/patches/localedata/locales-fr.diff: New file to add various
fixes for French locales. (Closes: #248377)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-01-15 17:23:54 UTC (rev 1106)
+++ glibc-package/trunk/debian/changelog 2006-01-15 17:25:40 UTC (rev 1107)
@@ -8,6 +8,8 @@
Reported by Graham Wilson <graham@mknod.org>. (Closes: #327025)
* debian/patches/localedata/first_weekday.diff: New file to add
first_weekday fields to most locales. (Closes: #343885, #347323)
+ * debian/patches/localedata/locales-fr.diff: New file to add various
+ fixes for French locales. (Closes: #248377)
-- Denis Barbier <barbier@debian.org> Sun, 15 Jan 2006 18:20:16 +0100
Added: glibc-package/trunk/debian/patches/localedata/locales-fr.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locales-fr.diff 2006-01-15 17:23:54 UTC (rev 1106)
+++ glibc-package/trunk/debian/patches/localedata/locales-fr.diff 2006-01-15 17:25:40 UTC (rev 1107)
@@ -0,0 +1,338 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Various fixes for all French locales
+# DP: Related bugs: #248377
+# DP: Dpatch author: Denis Barbier <barbier@debian.org>
+# DP: Patch author: Denis Barbier
+# DP: Upstream status: not submitted
+# DP: Date: 2006-01-10
+
+Index: glibc-2.3.5/localedata/locales/fr_BE
+===================================================================
+--- glibc-2.3.5.orig/localedata/locales/fr_BE
++++ glibc-2.3.5/localedata/locales/fr_BE
+@@ -42,6 +42,7 @@
+ category "fr_BE:2000";LC_NAME
+ category "fr_BE:2000";LC_ADDRESS
+ category "fr_BE:2000";LC_TELEPHONE
++category "fr_BE:2000";LC_MEASUREMENT
+
+ END LC_IDENTIFICATION
+
+@@ -79,7 +80,7 @@
+ LC_NUMERIC
+ decimal_point "<U002C>"
+ thousands_sep "<U002E>"
+-grouping 0;0
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
+@@ -117,9 +118,10 @@
+ t_fmt "<U0025><U0054>"
+ am_pm "";""
+ t_fmt_ampm ""
+-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+-<U0025><U005A><U0020><U0025><U0059>"
++date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
++<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
++<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
++<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
+ END LC_TIME
+
+ LC_PAPER
+@@ -142,8 +144,7 @@
+ END LC_MEASUREMENT
+
+ LC_NAME
+-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+-<U0025><U006D><U0025><U0074><U0025><U0066>"
++copy "fr_FR"
+ END LC_NAME
+
+ LC_ADDRESS
+@@ -155,4 +156,13 @@
+ country_ab2 "<U0042><U0045>"
+ country_ab3 "<U0042><U0045><U004C>"
+ country_num 056
++country_name "<U0042><U0065><U006C><U0067><U0069><U0071><U0075><U0065>"
++country_car "<U0042>"
++% FIXME
++country_post "<U0042><U0045>"
++country_isbn 2
++lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_ab "<U0066><U0072>"
++lang_term "<U0066><U0072><U0061>"
++lang_lib "<U0066><U0072><U0065>"
+ END LC_ADDRESS
+Index: glibc-2.3.5/localedata/locales/fr_CA
+===================================================================
+--- glibc-2.3.5.orig/localedata/locales/fr_CA
++++ glibc-2.3.5/localedata/locales/fr_CA
+@@ -43,6 +43,7 @@
+ category "fr_CA:2000";LC_NAME
+ category "fr_CA:2000";LC_ADDRESS
+ category "fr_CA:2000";LC_TELEPHONE
++category "fr_CA:2000";LC_MEASUREMENT
+
+ END LC_IDENTIFICATION
+
+@@ -63,7 +64,7 @@
+ int_curr_symbol "<U0043><U0041><U0044><U0020>"
+ currency_symbol "<U0024>"
+ mon_decimal_point "<U002C>"
+-mon_thousands_sep "<U0020>"
++mon_thousands_sep "<U00A0>"
+ mon_grouping 3;3
+ positive_sign ""
+ negative_sign "<U002D>"
+@@ -79,8 +80,8 @@
+
+ LC_NUMERIC
+ decimal_point "<U002C>"
+-thousands_sep "<U0020>"
+-grouping 0;0
++thousands_sep "<U00A0>"
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
+@@ -118,9 +119,10 @@
+ t_fmt "<U0025><U0054>"
+ am_pm "";""
+ t_fmt_ampm ""
+-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+-<U0025><U005A><U0020><U0025><U0059>"
++date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
++<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
++<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
++<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
+ END LC_TIME
+
+ LC_PAPER
+@@ -136,8 +138,7 @@
+ END LC_MEASUREMENT
+
+ LC_NAME
+-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+-<U0025><U006D><U0025><U0074><U0025><U0066>"
++copy "fr_FR"
+ END LC_NAME
+
+ LC_ADDRESS
+@@ -149,4 +150,12 @@
+ country_ab2 "<U0043><U0041>"
+ country_ab3 "<U0043><U0041><U004E>"
+ country_num 124
++country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
++country_car "<U0043><U0044><U004E>"
++country_post "<U0043><U0041>"
++country_isbn 2
++lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_ab "<U0066><U0072>"
++lang_term "<U0066><U0072><U0061>"
++lang_lib "<U0066><U0072><U0065>"
+ END LC_ADDRESS
+Index: glibc-2.3.5/localedata/locales/fr_CH
+===================================================================
+--- glibc-2.3.5.orig/localedata/locales/fr_CH
++++ glibc-2.3.5/localedata/locales/fr_CH
+@@ -43,6 +43,7 @@
+ category "fr_CH:2000";LC_NAME
+ category "fr_CH:2000";LC_ADDRESS
+ category "fr_CH:2000";LC_TELEPHONE
++category "fr_CH:2000";LC_MEASUREMENT
+
+ END LC_IDENTIFICATION
+
+@@ -64,9 +65,9 @@
+ END LC_MONETARY
+
+ LC_NUMERIC
+-decimal_point "<U002C>"
+-thousands_sep ""
+-grouping 0;0
++decimal_point "<U002E>"
++thousands_sep "<U0027>"
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
+@@ -104,9 +105,10 @@
+ t_fmt "<U0025><U0054>"
+ am_pm "";""
+ t_fmt_ampm ""
+-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+-<U0025><U005A><U0020><U0025><U0059>"
++date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
++<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
++<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
++<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
+ END LC_TIME
+
+ LC_PAPER
+@@ -128,8 +130,7 @@
+ END LC_MEASUREMENT
+
+ LC_NAME
+-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+-<U0025><U006D><U0025><U0074><U0025><U0066>"
++copy "fr_FR"
+ END LC_NAME
+
+ LC_ADDRESS
+@@ -141,4 +142,12 @@
+ country_ab2 "<U0043><U0048>"
+ country_ab3 "<U0043><U0048><U0045>"
+ country_num 756
++country_name "<U0053><U0075><U0069><U0073><U0073><U0065>"
++country_car "<U0043><U0048>"
++country_post "<U0043><U0048>"
++country_isbn 2
++lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_ab "<U0066><U0072>"
++lang_term "<U0066><U0072><U0061>"
++lang_lib "<U0066><U0072><U0065>"
+ END LC_ADDRESS
+Index: glibc-2.3.5/localedata/locales/fr_FR
+===================================================================
+--- glibc-2.3.5.orig/localedata/locales/fr_FR
++++ glibc-2.3.5/localedata/locales/fr_FR
+@@ -42,6 +42,7 @@
+ category "fr_FR:2000";LC_NAME
+ category "fr_FR:2000";LC_ADDRESS
+ category "fr_FR:2000";LC_TELEPHONE
++category "fr_FR:2000";LC_MEASUREMENT
+
+ END LC_IDENTIFICATION
+
+@@ -71,7 +72,7 @@
+ int_curr_symbol "<U0045><U0055><U0052><U0020>"
+ currency_symbol "<U20AC>"
+ mon_decimal_point "<U002C>"
+-mon_thousands_sep "<U0020>"
++mon_thousands_sep "<U00A0>"
+ mon_grouping 3;3
+ positive_sign ""
+ negative_sign "<U002D>"
+@@ -87,8 +88,8 @@
+
+ LC_NUMERIC
+ decimal_point "<U002C>"
+-thousands_sep ""
+-grouping 0;0
++thousands_sep "<U00A0>"
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
+@@ -126,9 +127,10 @@
+ t_fmt "<U0025><U0054>"
+ am_pm "";""
+ t_fmt_ampm ""
+-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+-<U0025><U005A><U0020><U0025><U0059>"
++date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
++<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
++<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
++<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
+ END LC_TIME
+
+ LC_PAPER
+@@ -151,6 +153,11 @@
+ LC_NAME
+ name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+ <U0025><U006D><U0025><U0074><U0025><U0066>"
++name_gen ""
++name_mr "<U004D><U002E>"
++name_mrs "<U004D><U006D><U0065>"
++name_miss "<U004D><U006C><U006C><U0065>"
++name_ms ""
+ END LC_NAME
+
+ LC_ADDRESS
+@@ -162,4 +169,12 @@
+ country_ab2 "<U0046><U0052>"
+ country_ab3 "<U0046><U0052><U0041>"
+ country_num 250
++country_name "<U0046><U0072><U0061><U006E><U0063><U0065>"
++country_car "<U0046>"
++country_post "<U0046><U0052>"
++country_isbn 2
++lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_ab "<U0066><U0072>"
++lang_term "<U0066><U0072><U0061>"
++lang_lib "<U0066><U0072><U0065>"
+ END LC_ADDRESS
+Index: glibc-2.3.5/localedata/locales/fr_LU
+===================================================================
+--- glibc-2.3.5.orig/localedata/locales/fr_LU
++++ glibc-2.3.5/localedata/locales/fr_LU
+@@ -42,6 +42,7 @@
+ category "fr_LU:2000";LC_NAME
+ category "fr_LU:2000";LC_ADDRESS
+ category "fr_LU:2000";LC_TELEPHONE
++category "fr_LU:2000";LC_MEASUREMENT
+
+ END LC_IDENTIFICATION
+
+@@ -62,7 +63,7 @@
+ int_curr_symbol "<U0045><U0055><U0052><U0020>"
+ currency_symbol "<U20AC>"
+ mon_decimal_point "<U002C>"
+-mon_thousands_sep "<U0020>"
++mon_thousands_sep "<U00A0>"
+ mon_grouping 3;3
+ positive_sign ""
+ negative_sign "<U002D>"
+@@ -78,8 +79,8 @@
+
+ LC_NUMERIC
+ decimal_point "<U002C>"
+-thousands_sep ""
+-grouping 0;0
++thousands_sep "<U00A0>"
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
+@@ -117,9 +118,10 @@
+ t_fmt "<U0025><U0054>"
+ am_pm "";""
+ t_fmt_ampm ""
+-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+-<U0025><U005A><U0020><U0025><U0059>"
++date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
++<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
++<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
++<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
+ END LC_TIME
+
+ LC_PAPER
+@@ -141,8 +143,7 @@
+ END LC_MEASUREMENT
+
+ LC_NAME
+-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+-<U0025><U006D><U0025><U0074><U0025><U0066>"
++copy "fr_FR"
+ END LC_NAME
+
+ LC_ADDRESS
+@@ -154,4 +155,12 @@
+ country_ab2 "<U004C><U0055>"
+ country_ab3 "<U004C><U0055><U0058>"
+ country_num 442
++country_name "<U004C><U0075><U0078><U0065><U006D><U0062><U006F><U0075><U0072><U0067>"
++country_car "<U004C>"
++country_post "<U004C><U0055>"
++country_isbn 2
++lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
++lang_ab "<U0066><U0072>"
++lang_term "<U0066><U0072><U0061>"
++lang_lib "<U0066><U0072><U0065>"
+ END LC_ADDRESS
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-01-15 17:23:54 UTC (rev 1106)
+++ glibc-package/trunk/debian/patches/series 2006-01-15 17:25:40 UTC (rev 1107)
@@ -113,4 +113,5 @@
locale/locale-print-LANGUAGE.diff
locale/fix-C-first_weekday.diff -p0
localedata/tl_PH-yesexpr.diff
+localedata/locales-fr.diff
localedata/first_weekday.diff
Reply to: