r3983 - in glibc-package/trunk/debian: . patches patches/locale
Author: aurel32
Date: 2009-11-18 09:55:04 +0000 (Wed, 18 Nov 2009)
New Revision: 3983
Added:
glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff
Removed:
glibc-package/trunk/debian/patches/locale/fix-C-first_weekday.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Replace patches/locale/fix-C-first_weekday.diff by upstream version
patches/locale/cvs-C-first_weekday.diff. Closes: #556884.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-17 21:51:05 UTC (rev 3982)
+++ glibc-package/trunk/debian/changelog 2009-11-18 09:55:04 UTC (rev 3983)
@@ -9,8 +9,10 @@
with MALLOC_CHECK.
* patches/any/cvs-ksm.diff: add support to KSM, define MADV_MERGEABLE and
MADV_UNMERGEABLE. Closes: #556631.
+ * Replace patches/locale/fix-C-first_weekday.diff by upstream version
+ patches/locale/cvs-C-first_weekday.diff. Closes: #556884.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 17 Nov 2009 22:39:56 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 18 Nov 2009 10:54:07 +0100
eglibc (2.10.1-7) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff (rev 0)
+++ glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff 2009-11-18 09:55:04 UTC (rev 3983)
@@ -0,0 +1,22 @@
+2009-10-05 Andreas Schwab <schwab@redhat.com>
+
+ * locale/C-time.c: Revert week-1stday back to 19971130 and set
+ first_weekday to 1 and first_workday to 2.
+
+diff --git a/locale/C-time.c b/locale/C-time.c
+index a9275d9..368ffce 100644
+--- a/locale/C-time.c
++++ b/locale/C-time.c
+@@ -134,10 +134,10 @@ const struct locale_data _nl_C_LC_TIME attribute_hidden =
+ { .wstr = (const uint32_t *) L"" },
+ { .wstr = (const uint32_t *) L"" },
+ { .string = "\7" },
+- { .word = 19971201 },
++ { .word = 19971130 },
+ { .string = "\4" },
+- { .string = "\7" },
+ { .string = "\1" },
++ { .string = "\2" },
+ { .string = "\1" },
+ { .string = "" },
+ { .string = "%a %b %e %H:%M:%S %Z %Y" },
Deleted: glibc-package/trunk/debian/patches/locale/fix-C-first_weekday.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale/fix-C-first_weekday.diff 2009-11-17 21:51:05 UTC (rev 3982)
+++ glibc-package/trunk/debian/patches/locale/fix-C-first_weekday.diff 2009-11-18 09:55:04 UTC (rev 3983)
@@ -1,27 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: #327025 C locale has bad default for _NL_TIME_FIRST_WEEKDAY
-# DP: Also fixes the 3rd value of the week keyword.
-# DP: Related bugs: #327025 BZ181
-# DP: Dpatch author: Denis Barbier
-# DP: Patch author: Petter Reinholdtsen
-# DP: Upstream status: BZ181
-# DP: Date: 2006-01-10
-
----
- locale/C-time.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/locale/C-time.c
-+++ b/locale/C-time.c
-@@ -135,10 +135,10 @@
- { .wstr = (const uint32_t *) L"" },
- { .string = "\7" },
- { .word = 19971201 },
-- { .string = "\4" },
- { .string = "\7" },
- { .string = "\1" },
- { .string = "\1" },
-+ { .string = "\1" },
- { .string = "" },
- { .string = "%a %b %e %H:%M:%S %Z %Y" },
- { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-11-17 21:51:05 UTC (rev 3982)
+++ glibc-package/trunk/debian/patches/series 2009-11-18 09:55:04 UTC (rev 3983)
@@ -6,7 +6,7 @@
locale/preprocessor-collate.diff # should not be needed anymore, but keep it anyways.
locale/locale-print-LANGUAGE.diff
locale/LC_IDENTIFICATION-optional-fields.diff
-locale/fix-C-first_weekday.diff
+locale/cvs-C-first_weekday.diff
locale/LC_COLLATE-keywords-ordering.diff
localedata/local-all-no-archive.diff
localedata/sort-UTF8-first.diff
Reply to: