r2370 - in glibc-package/branches/glibc-2.6/debian: . patches/locale
Author: madcoder
Date: 2007-06-17 15:22:45 +0000 (Sun, 17 Jun 2007)
New Revision: 2370
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
Log:
Does not work either :///
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-06-17 14:31:16 UTC (rev 2369)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-06-17 15:22:45 UTC (rev 2370)
@@ -1,4 +1,4 @@
-glibc (2.6-0exp2) experimental; urgency=low
+glibc (2.6-0exp3) UNRELEASED; urgency=low
[ Pierre Habouzit ]
[ Clint Adams]
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-06-17 14:31:16 UTC (rev 2369)
+++ glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-06-17 15:22:45 UTC (rev 2370)
@@ -20,7 +20,35 @@
now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
{
-@@ -2815,9 +2814,6 @@
+@@ -2794,14 +2793,23 @@
+ switch (nowtok)
+ {
+ case tok_copy:
+- /* Allow copying other locales. */
++ /* Ignore the rest of the line if we don't need the input of
++ this line. */
++ if (ignore_content)
++ {
++ lr_ignore_rest (ldfile, 0);
++ break;
++ }
++
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
+ if (now->tok != tok_string)
+ goto err_label;
+
+- if (! ignore_content)
+- load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
+- charmap, result);
++ if (state == 1 || state == 3 || state == 5)
++ goto err_label;
++
++ load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
++ charmap, result);
+
+ lr_ignore_rest (ldfile, 1);
+ break;
+@@ -2815,9 +2823,6 @@
break;
}
@@ -30,7 +58,7 @@
arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_number)
goto err_label;
-@@ -2838,7 +2834,7 @@
+@@ -2838,7 +2843,7 @@
break;
}
@@ -39,7 +67,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2885,7 +2881,7 @@
+@@ -2885,7 +2890,7 @@
break;
}
@@ -48,7 +76,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2954,7 +2950,7 @@
+@@ -2954,7 +2959,7 @@
break;
}
@@ -57,7 +85,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3102,7 +3098,7 @@
+@@ -3102,7 +3107,7 @@
break;
}
@@ -66,7 +94,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3218,7 +3214,7 @@
+@@ -3218,7 +3223,7 @@
break;
}
@@ -75,7 +103,7 @@
goto err_label;
state = 1;
-@@ -3390,8 +3386,12 @@
+@@ -3390,8 +3395,12 @@
was_ellipsis = tok_none;
}
}
@@ -90,7 +118,7 @@
state = 3;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3526,8 +3526,6 @@
+@@ -3526,8 +3535,6 @@
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
state = 4;
}
@@ -99,7 +127,7 @@
state = 5;
/* Get the name of the sections we are adding after. */
-@@ -4073,7 +4071,7 @@
+@@ -4073,7 +4080,7 @@
/* Next we assume `LC_COLLATE'. */
if (!ignore_content)
{
Reply to: