r1179 - in glibc-package/trunk/debian: . patches patches/localedata
Author: barbier
Date: 2006-02-15 22:01:31 +0000 (Wed, 15 Feb 2006)
New Revision: 1179
Added:
glibc-package/trunk/debian/patches/localedata/locales_CH.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/localedata/locales-fr.diff
glibc-package/trunk/debian/patches/series
Log:
Fix thousand separator for de_CH, and let other Swiss locales copy
de_CH for LC_NUMERIC and LC_MONETARY sections. (Closes: #345481)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-15 21:03:11 UTC (rev 1178)
+++ glibc-package/trunk/debian/changelog 2006-02-15 22:01:31 UTC (rev 1179)
@@ -14,6 +14,8 @@
* debian/control: Split Build-Depends on several lines for readability
purpose.
* Add RON to locale/iso-4217.def and bump LOCALES_COMPAT_VER to 2.3.6-2.
+ * Fix thousand separator for de_CH, and let other Swiss locales copy
+ de_CH for LC_NUMERIC and LC_MONETARY sections. (Closes: #345481)
[ Clint Adams ]
* Add hurd-getresuid-dyslexia.diff (fixes incorrect ordering of
Modified: glibc-package/trunk/debian/patches/localedata/locales-fr.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locales-fr.diff 2006-02-15 21:03:11 UTC (rev 1178)
+++ glibc-package/trunk/debian/patches/localedata/locales-fr.diff 2006-02-15 22:01:31 UTC (rev 1179)
@@ -1,6 +1,6 @@
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Various fixes for all French locales
-# DP: Related bugs: #248377 #351786
+# DP: Related bugs: #248377 #351786 #345481
# DP: Dpatch author: Denis Barbier <barbier@debian.org>
# DP: Patch author: Denis Barbier
# DP: Upstream status: not submitted
@@ -135,16 +135,14 @@
END LC_IDENTIFICATION
-@@ -64,9 +65,9 @@
+@@ -64,9 +65,7 @@
END LC_MONETARY
LC_NUMERIC
-decimal_point "<U002C>"
-thousands_sep ""
-grouping 0;0
-+decimal_point "<U002E>"
-+thousands_sep "<U0027>"
-+grouping 3;3
++copy "de_CH"
END LC_NUMERIC
LC_TIME
Added: glibc-package/trunk/debian/patches/localedata/locales_CH.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locales_CH.diff 2006-02-15 21:03:11 UTC (rev 1178)
+++ glibc-package/trunk/debian/patches/localedata/locales_CH.diff 2006-02-15 22:01:31 UTC (rev 1179)
@@ -0,0 +1,45 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: thousand separator for Swiss locales is '
+# DP: Related bugs: #345481
+# DP: Dpatch author: Denis Barbier <barbier@debian.org>
+# DP: Patch author: Denis Barbier
+# DP: Upstream status: not submitted
+# DP: Date: 2006-02-16
+
+Index: glibc-2.3.6/localedata/locales/de_CH
+===================================================================
+--- glibc-2.3.6.orig/localedata/locales/de_CH
++++ glibc-2.3.6/localedata/locales/de_CH
+@@ -62,7 +62,7 @@
+ int_curr_symbol "<U0043><U0048><U0046><U0020>"
+ currency_symbol "<U0046><U0072><U002E>"
+ mon_decimal_point "<U002E>"
+-mon_thousands_sep "<U0020>"
++mon_thousands_sep "<U0027>"
+ mon_grouping 3;3
+ positive_sign ""
+ negative_sign "<U002D>"
+@@ -78,7 +78,7 @@
+
+ LC_NUMERIC
+ decimal_point "<U002E>"
+-thousands_sep "<U0020>"
++thousands_sep "<U0027>"
+ grouping 3;3
+ END LC_NUMERIC
+
+Index: glibc-2.3.6/localedata/locales/it_CH
+===================================================================
+--- glibc-2.3.6.orig/localedata/locales/it_CH
++++ glibc-2.3.6/localedata/locales/it_CH
+@@ -57,9 +57,7 @@
+ END LC_MONETARY
+
+ LC_NUMERIC
+-decimal_point "<U002C>"
+-thousands_sep "<U0027>"
+-grouping 3;3
++copy "de_CH"
+ END LC_NUMERIC
+
+ LC_TIME
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-02-15 21:03:11 UTC (rev 1178)
+++ glibc-package/trunk/debian/patches/series 2006-02-15 22:01:31 UTC (rev 1179)
@@ -100,6 +100,7 @@
locale/fix-C-first_weekday.diff -p0
localedata/tl_PH-yesexpr.diff
localedata/fo_FO-date_fmt.diff
+localedata/locales_CH.diff
localedata/locales-fr.diff
localedata/supported.diff
localedata/locale-sa_IN.diff -p0
Reply to: