Author: barbier
Date: 2006-03-10 13:51:51 +0000 (Fri, 10 Mar 2006)
New Revision: 1285
Added:
glibc-package/trunk/debian/patches/strfmon.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add strfmon.diff: the negative sign is not printed by strfmon when
current locale defines sign_posn == 4 (as in de_CH) and format
argument contains the ! modifier.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-03-09 22:10:13 UTC (rev
1284)
+++ glibc-package/trunk/debian/changelog 2006-03-10 13:51:51 UTC (rev
1285)
@@ -15,6 +15,9 @@
[ Denis Barbier ]
* locales.config: If $DEBCONF_IS_A_REGISTRY is set to a non-empty value,
the content of /etc/locale.gen does not override debconf values.
+ * Add strfmon.diff: the negative sign is not printed by strfmon when
+ current locale defines sign_posn == 4 (as in de_CH) and format
+ argument contains the ! modifier.
-- Denis Barbier <[EMAIL PROTECTED]> Mon, 6 Mar 2006 00:40:52 +0100
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-03-09 22:10:13 UTC (rev
1284)
+++ glibc-package/trunk/debian/patches/series 2006-03-10 13:51:51 UTC (rev
1285)
@@ -134,3 +134,4 @@
hppa-inlining.diff -p1
regcomp_c.diff -p1
tst-setcontext_c.diff -p1
+strfmon.diff
Added: glibc-package/trunk/debian/patches/strfmon.diff
===================================================================
--- glibc-package/trunk/debian/patches/strfmon.diff 2006-03-09 22:10:13 UTC
(rev 1284)
+++ glibc-package/trunk/debian/patches/strfmon.diff 2006-03-10 13:51:51 UTC
(rev 1285)
@@ -0,0 +1,60 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: The negative sign is not printed by strfmon when
+# DP: current locale defines sign_posn == 4 (as in de_CH) and
+# DP: format argument contains the ! modifier.
+# DP: Note: upstream will fix indentation when applying this patch,
+# DP: it has intentionnally been kept this way for readability.
+# DP: Related bugs: BZ2420
+# DP: Dpatch author: Denis Barbier
+# DP: Patch author: Denis Barbier
+# DP: Upstream status:
+# DP: Status Details:
+
+Index: glibc-2.3.6/stdlib/strfmon_l.c
+===================================================================
+--- glibc-2.3.6.orig/stdlib/strfmon_l.c
++++ glibc-2.3.6/stdlib/strfmon_l.c
+@@ -491,12 +491,11 @@
+ }
+
+ if (print_curr_symbol)
+- {
+- out_string (currency_symbol);
++ out_string (currency_symbol);
+
+ if (sign_posn == 4)
+ {
+- if (sep_by_space == 2)
++ if (sep_by_space == 2 && print_curr_symbol)
+ out_char (space_char);
+ out_string (sign_string);
+ if (sep_by_space == 1)
+@@ -505,9 +504,8 @@
+ out_char (' ');
+ }
+ else
+- if (sep_by_space == 1)
++ if (sep_by_space == 1 && print_curr_symbol)
+ out_char (space_char);
+- }
+ }
+ else
+ if (sign_posn != 0 && sign_posn != 2 && sign_posn != 3
+@@ -583,13 +581,13 @@
+ || (sign_posn == 0 && sep_by_space == 1))
+ out_char (space_char);
+ out_nstring (currency_symbol, currency_symbol_len);
++ }
+ if (sign_posn == 4)
+ {
+- if (sep_by_space == 2)
++ if (sep_by_space == 2 && print_curr_symbol)
+ out_char (' ');
+ out_string (sign_string);
+ }
+- }
+ }
+
+ if (sign_posn == 2)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
