Author: madcoder
Date: 2007-05-21 22:05:13 +0000 (Mon, 21 May 2007)
New Revision: 2272
Modified:
glibc-package/branches/glibc-2.6/debian/patches/locale/check-unknown-symbols.diff
glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
fix a few more patches.
Signed-off-by: Pierre Habouzit <[EMAIL PROTECTED]>
Modified:
glibc-package/branches/glibc-2.6/debian/patches/locale/check-unknown-symbols.diff
===================================================================
---
glibc-package/branches/glibc-2.6/debian/patches/locale/check-unknown-symbols.diff
2007-05-21 22:00:49 UTC (rev 2271)
+++
glibc-package/branches/glibc-2.6/debian/patches/locale/check-unknown-symbols.diff
2007-05-21 22:05:13 UTC (rev 2272)
@@ -8,10 +8,10 @@
# DP: Upstream status: not submitted
# DP: Date: 2006-01-08
-Index: glibc-2.3.5/locale/programs/ld-collate.c
+Index: glibc-2.6/locale/programs/ld-collate.c
===================================================================
---- glibc-2.3.5.orig/locale/programs/ld-collate.c
-+++ glibc-2.3.5/locale/programs/ld-collate.c
+--- glibc-2.6.orig/locale/programs/ld-collate.c
++++ glibc-2.6/locale/programs/ld-collate.c
@@ -3524,8 +3524,20 @@
}
else if (arg != NULL)
Modified:
glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff
===================================================================
---
glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff
2007-05-21 22:00:49 UTC (rev 2271)
+++
glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff
2007-05-21 22:05:13 UTC (rev 2272)
@@ -109,7 +109,7 @@
static void
collate_startup (struct linereader *ldfile, struct localedef_t *locale,
struct localedef_t *copy_locale, int ignore_content)
-@@ -3784,6 +3858,205 @@
+@@ -3796,6 +3870,205 @@
repertoire, result, nowtok);
break;
@@ -315,7 +315,7 @@
case tok_end:
/* Next we assume `LC_COLLATE'. */
if (!ignore_content)
-@@ -3813,6 +4086,13 @@
+@@ -3825,6 +4098,13 @@
else if (state == 5)
WITH_CUR_LOCALE (error (0, 0, _("\
%s: missing `reorder-sections-end' keyword"), "LC_COLLATE"));
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-21
22:00:49 UTC (rev 2271)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-21
22:05:13 UTC (rev 2272)
@@ -3,7 +3,7 @@
localedata/locale-no_NO.diff -p0
localedata/locale-eu_FR.diff -p0
localedata/locale-ku_TR.diff -p0
-# locale/check-unknown-symbols.diff # locales have to be fixed first
+locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff -p0
locale/preprocessor-collate.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
