r1829 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: aurel32
Date: 2006-10-01 23:22:43 +0000 (Sun, 01 Oct 2006)
New Revision: 1829
Removed:
glibc-package/branches/glibc-2.5/debian/patches/any/submitted-strfmon.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* Remove any/submitted-strfmon.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-01 22:40:54 UTC (rev 1828)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-01 23:22:43 UTC (rev 1829)
@@ -19,13 +19,13 @@
* Remove any/cvs-sysctl.diff (merged upstream).
* Remove any/cvs-thread_signals.diff (merged upstream).
* Remove any/cvs-uio_h.diff (merged upstream).
+ * Remove any/submitted-strfmon.diff (merged upstream).
* Update arm/local-no-hwcap.diff.
* Update any/local-ldso-disable-hwcap.diff.
* debhelper.in/libc.docs: remove INTERFACE as it has been removed upstream.
* *Temporarily* disable the following patches, they need to be ported:
- all/submitted-new-brf-encoding.diff
- all/submitted-uninitialized-byte-LC_CTYPE.diff
- - any/submitted-strfmon.diff
- any/local-ttyname-devfs.diff
[ Denis Barbier ]
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/submitted-strfmon.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/submitted-strfmon.diff 2006-10-01 22:40:54 UTC (rev 1828)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/submitted-strfmon.diff 2006-10-01 23:22:43 UTC (rev 1829)
@@ -1,56 +0,0 @@
-# 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)
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-01 22:40:54 UTC (rev 1828)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-01 23:22:43 UTC (rev 1829)
@@ -112,4 +112,3 @@
any/local-version-sanity.diff -p1
any/local-dynamic-resolvconf.diff -p1
any/submitted-nis-netgrp.diff
-#any/submitted-strfmon.diff
Reply to: