Author: madcoder
Date: 2007-06-17 14:31:16 +0000 (Sun, 17 Jun 2007)
New Revision: 2369
Removed:
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff
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:
Problem seems to be because of us in fact.
Signed-off-by: Pierre Habouzit <[EMAIL PROTECTED]>
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-06-17 13:37:13 UTC
(rev 2368)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-06-17 14:31:16 UTC
(rev 2369)
@@ -87,8 +87,6 @@
* kernelchecks.sh: add some quotes to unconfuse syntax hilighting a bit.
* nscd.init: ksh is confused if you call functions start or stop.
Closes: 428884.
- * patches/locale/LC_COLLATE-fix_tok_copy.diff: fix an issue with the "copy"
- token when it isn't the first rule in a LC_COLLATION block (sigh).
-- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 17 Jun 2007 14:15:39 +0100
Deleted:
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff
===================================================================
---
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff
2007-06-17 13:37:13 UTC (rev 2368)
+++
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff
2007-06-17 14:31:16 UTC (rev 2369)
@@ -1,25 +0,0 @@
-Index: glibc-2.6/locale/programs/ld-collate.c
-===================================================================
---- glibc-2.6.orig/locale/programs/ld-collate.c
-+++ glibc-2.6/locale/programs/ld-collate.c
-@@ -2808,8 +2808,18 @@
- if (state == 1 || state == 3 || state == 5)
- goto err_label;
-
-- load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
-- charmap, result);
-+ /* Get the locale definition. */
-+ copy_locale = load_locale (LC_COLLATE, now->val.str.startmb,
-+ repertoire_name, charmap, NULL);
-+ if ((copy_locale->avail & COLLATE_LOCALE) == 0)
-+ {
-+ /* Not yet loaded. So do it now. */
-+ if (locfile_read (copy_locale, charmap) != 0)
-+ goto skip_category;
-+ }
-+
-+ if (copy_locale->categories[LC_COLLATE].collate == NULL)
-+ return;
-
- lr_ignore_rest (ldfile, 1);
- break;
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 13:37:13 UTC (rev 2368)
+++
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
2007-06-17 14:31:16 UTC (rev 2369)
@@ -20,35 +20,7 @@
now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
{
-@@ -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 @@
+@@ -2815,9 +2814,6 @@
break;
}
@@ -58,7 +30,7 @@
arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_number)
goto err_label;
-@@ -2838,7 +2843,7 @@
+@@ -2838,7 +2834,7 @@
break;
}
@@ -67,7 +39,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2885,7 +2890,7 @@
+@@ -2885,7 +2881,7 @@
break;
}
@@ -76,7 +48,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2954,7 +2959,7 @@
+@@ -2954,7 +2950,7 @@
break;
}
@@ -85,7 +57,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3102,7 +3107,7 @@
+@@ -3102,7 +3098,7 @@
break;
}
@@ -94,7 +66,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3218,7 +3223,7 @@
+@@ -3218,7 +3214,7 @@
break;
}
@@ -103,7 +75,7 @@
goto err_label;
state = 1;
-@@ -3390,8 +3395,12 @@
+@@ -3390,8 +3386,12 @@
was_ellipsis = tok_none;
}
}
@@ -118,7 +90,7 @@
state = 3;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3526,8 +3535,6 @@
+@@ -3526,8 +3526,6 @@
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
state = 4;
}
@@ -127,7 +99,7 @@
state = 5;
/* Get the name of the sections we are adding after. */
-@@ -4073,7 +4080,7 @@
+@@ -4073,7 +4071,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-06-17
13:37:13 UTC (rev 2368)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-06-17
14:31:16 UTC (rev 2369)
@@ -8,7 +8,6 @@
locale/preprocessor-collate.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
locale/LC_COLLATE-keywords-ordering.diff -p0
-locale/LC_COLLATE-fix_tok_copy.diff
locale/locale-print-LANGUAGE.diff -p0
locale/fix-C-first_weekday.diff -p0
localedata/tl_PH-yesexpr.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
