r2271 - in glibc-package/branches/glibc-2.6/debian: . patches patches/locale
Author: madcoder
Date: 2007-05-21 22:00:49 +0000 (Mon, 21 May 2007)
New Revision: 2271
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
fix LC_COLLATE patch
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-21 16:03:09 UTC (rev 2270)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-21 22:00:49 UTC (rev 2271)
@@ -4,7 +4,7 @@
* New upstream version.
- Remove locale/iso3166-RS.diff (obsolete).
- Remove locale/fix-exhausted-memory.diff (merged upstream).
- - Disable locale/LC_COLLATE-keywords-ordering.diff (broken).
+ - Update locale/LC_COLLATE-keywords-ordering.diff.
- Remove localedata/locale-pl_PL.diff (merged upstream).
- Remove localedata/locales-sr.diff (obsolete).
- Disable localedata/tailor-iso14651_t1.diff (broken).
Modified: glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-05-21 16:03:09 UTC (rev 2270)
+++ glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-05-21 22:00:49 UTC (rev 2271)
@@ -12,7 +12,7 @@
===================================================================
--- locale/programs/ld-collate.c.orig
+++ locale/programs/ld-collate.c
-@@ -2719,7 +2719,6 @@
+@@ -2720,7 +2720,6 @@
if (nowtok == tok_copy)
{
@@ -20,7 +20,7 @@
now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
{
-@@ -2793,14 +2792,23 @@
+@@ -2794,14 +2793,23 @@
switch (nowtok)
{
case tok_copy:
@@ -48,7 +48,7 @@
lr_ignore_rest (ldfile, 1);
break;
-@@ -2814,9 +2822,6 @@
+@@ -2815,9 +2823,6 @@
break;
}
@@ -58,7 +58,7 @@
arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_number)
goto err_label;
-@@ -2837,7 +2842,7 @@
+@@ -2838,7 +2843,7 @@
break;
}
@@ -67,7 +67,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2884,7 +2889,7 @@
+@@ -2885,7 +2890,7 @@
break;
}
@@ -76,7 +76,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2953,7 +2958,7 @@
+@@ -2954,7 +2959,7 @@
break;
}
@@ -85,7 +85,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3101,7 +3106,7 @@
+@@ -3102,7 +3107,7 @@
break;
}
@@ -94,16 +94,16 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3217,7 +3222,7 @@
+@@ -3218,7 +3223,7 @@
break;
}
-- if (state != 0 && state != 1)
+- if (state != 0 && state != 1 && state != 2)
+ if (state == 3 || state == 5)
goto err_label;
state = 1;
-@@ -3388,8 +3393,12 @@
+@@ -3390,8 +3395,12 @@
was_ellipsis = tok_none;
}
}
@@ -118,7 +118,7 @@
state = 3;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3524,8 +3533,6 @@
+@@ -3526,8 +3535,6 @@
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
state = 4;
}
@@ -127,7 +127,7 @@
state = 5;
/* Get the name of the sections we are adding after. */
-@@ -4060,7 +4067,7 @@
+@@ -4061,7 +4068,7 @@
/* Next we assume `LC_COLLATE'. */
if (!ignore_content)
{
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-21 16:03:09 UTC (rev 2270)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-21 22:00:49 UTC (rev 2271)
@@ -7,7 +7,7 @@
locale/fix-LC_COLLATE-rules.diff -p0
locale/preprocessor-collate.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
-# locale/LC_COLLATE-keywords-ordering.diff -p0
+locale/LC_COLLATE-keywords-ordering.diff -p0
locale/locale-print-LANGUAGE.diff -p0
locale/fix-C-first_weekday.diff -p0
localedata/tl_PH-yesexpr.diff
Reply to: