r2592 - in glibc-package/branches/glibc-2.7/debian: . patches patches/locale patches/localedata
Author: schizo
Date: 2007-10-23 16:10:32 +0000 (Tue, 23 Oct 2007)
New Revision: 2592
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff
glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
more locale patch cleanup
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-23 14:24:51 UTC (rev 2591)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-23 16:10:32 UTC (rev 2592)
@@ -1,10 +1,11 @@
-glibc (2.7~0exp0-0exp3) experimental; urgency=low
+glibc (2.7~0exp0-0exp4) experimental; urgency=low
* New upstream release with ports snapshot.
- Remove localedata/locale-de_CH.diff (merged).
- Update locale/fix-LC_COLLATE-rules.diff.
- Update locale/LC_COLLATE-keywords-ordering.diff.
- Update locale/fix-C-first_weekday.diff.
+ - Update locale/preprocessor-collate.diff.
- Update localedata/locales-fr.diff.
- Remove localedata/locale-sa_IN.diff (merged).
- Remove localedata/locale-wo_SN.diff (merged).
@@ -28,7 +29,7 @@
- Add localedata/nb_NO-first_weekday.diff.
- Add localedata/nn_NO-first_weekday.diff.
- Add localedata/sk_SK-first_weekday.diff.
- - Disable localedata/sort-UTF8-first.diff.
+ - Update localedata/sort-UTF8-first.diff.
- Remove localedata/submitted-as_IN.diff (merged).
- Disable amd64/local-linuxthreads-gscope.diff.
- Disable hppa/submitted-lt.diff.
@@ -65,7 +66,6 @@
- Disable any/submitted-strfry.diff.
- Remove any/submitted-strtok.diff (merged).
- Remove any/submitted-regex-collate.diff (merged).
- - Disable locale/preprocessor-collate.diff.
* Bump shlib version to 2.7-1.
-- Clint Adams <schizo@debian.org> Sun, 21 Oct 2007 18:51:47 -0400
Modified: glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff 2007-10-23 14:24:51 UTC (rev 2591)
+++ glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff 2007-10-23 16:10:32 UTC (rev 2592)
@@ -12,8 +12,8 @@
Index: locale/programs/ld-collate.c
===================================================================
---- locale/programs/ld-collate.c.orig 2007-10-23 08:46:55.000000000 -0400
-+++ locale/programs/ld-collate.c 2007-10-23 08:46:59.000000000 -0400
+--- locale/programs/ld-collate.c.orig 2007-10-23 12:03:48.000000000 -0400
++++ locale/programs/ld-collate.c 2007-10-23 12:03:49.000000000 -0400
@@ -160,6 +160,24 @@
size_t line;
};
@@ -198,133 +198,7 @@
if (nowtok == tok_copy)
{
now = lr_token (ldfile, charmap, result, NULL, verbose);
-@@ -3911,6 +4060,125 @@
- repertoire, result, nowtok);
- break;
-
-+ case tok_ifdef:
-+ /* 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;
-+ }
-+
-+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
-+ if (arg->tok != tok_ident)
-+ goto err_label;
-+ else
-+ {
-+ struct toggle_list_t *runp = defined_keywords;
-+ struct toggle_list_t *flow = (struct toggle_list_t *) xcalloc (1, sizeof (*runp));
-+ flow->name = "ifdef";
-+ flow->file = ldfile->fname;
-+ flow->line = ldfile->lineno;
-+ flow->last = collate->flow_control;
-+ collate->flow_control = flow;
-+
-+ while (runp != NULL)
-+ if (strncmp (runp->name, arg->val.str.startmb,
-+ arg->val.str.lenmb) == 0
-+ && runp->name[arg->val.str.lenmb] == '\0')
-+ break;
-+ else
-+ runp = runp->last;
-+
-+ if (runp == NULL)
-+ {
-+ now = flow_skip(ldfile, charmap, collate);
-+ if (now->tok == tok_eof)
-+ WITH_CUR_LOCALE (error (0, 0, _("\
-+%s: unterminated `%s' flow control"), "LC_COLLATE", collate->flow_control->name));
-+ }
-+ }
-+ lr_ignore_rest (ldfile, 1);
-+ break;
-+
-+ case tok_ifndef:
-+ /* 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;
-+ }
-+
-+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
-+ if (arg->tok != tok_ident)
-+ goto err_label;
-+ else
-+ {
-+ struct toggle_list_t *runp = defined_keywords;
-+ struct toggle_list_t *flow = (struct toggle_list_t *) xcalloc (1, sizeof (*runp));
-+ flow->name = "ifndef";
-+ flow->file = ldfile->fname;
-+ flow->line = ldfile->lineno;
-+ flow->last = collate->flow_control;
-+ collate->flow_control = flow;
-+
-+ while (runp != NULL)
-+ if (strncmp (runp->name, arg->val.str.startmb,
-+ arg->val.str.lenmb) == 0
-+ && runp->name[arg->val.str.lenmb] == '\0')
-+ break;
-+ else
-+ runp = runp->last;
-+
-+ if (runp != NULL)
-+ {
-+ now = flow_skip(ldfile, charmap, collate);
-+ if (now->tok == tok_eof)
-+ WITH_CUR_LOCALE (error (0, 0, _("\
-+%s: unterminated `%s' flow control"), "LC_COLLATE", collate->flow_control->name));
-+ }
-+ }
-+ lr_ignore_rest (ldfile, 1);
-+ break;
-+
-+ case tok_else:
-+ /* 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;
-+ }
-+
-+ if (strcmp (collate->flow_control->name, "else") == 0)
-+ lr_error (ldfile,
-+ _("%s: `else' statement at `%s:%Zu' cannot be followed by another `else' statement"),
-+ "LC_COLLATE", collate->flow_control->name, collate->flow_control->line);
-+ collate->flow_control->name = "else";
-+ collate->flow_control->file = ldfile->fname;
-+ collate->flow_control->line = ldfile->lineno;
-+ now = flow_skip(ldfile, charmap, collate);
-+ if (now->tok == tok_eof)
-+ WITH_CUR_LOCALE (error (0, 0, _("\
-+%s: unterminated `%s' flow control"), "LC_COLLATE", collate->flow_control->name));
-+ break;
-+
-+ case tok_endif:
-+ /* 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;
-+ }
-+
-+ if (collate->flow_control == NULL)
-+ goto err_label;
-+ else
-+ collate->flow_control = collate->flow_control->last;
-+ break;
-+
- case tok_end:
- seen_end:
- /* Next we assume `LC_COLLATE'. */
-@@ -3941,6 +4209,13 @@
+@@ -3941,6 +4090,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.7/debian/patches/localedata/sort-UTF8-first.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff 2007-10-23 14:24:51 UTC (rev 2591)
+++ glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff 2007-10-23 16:10:32 UTC (rev 2592)
@@ -1,6 +1,8 @@
---- localedata/SUPPORTED.orig
-+++ localedata/SUPPORTED
-@@ -225,8 +225,8 @@
+Index: localedata/SUPPORTED
+===================================================================
+--- localedata/SUPPORTED.orig 2007-10-23 11:54:23.000000000 -0400
++++ localedata/SUPPORTED 2007-10-23 11:57:25.000000000 -0400
+@@ -232,8 +232,8 @@
hi_IN/UTF-8 \
hr_HR.UTF-8/UTF-8 \
hr_HR/ISO-8859-2 \
@@ -10,8 +12,8 @@
hu_HU.UTF-8/UTF-8 \
hu_HU/ISO-8859-2 \
hy_AM/UTF-8 \
-@@ -243,8 +243,8 @@
- it_IT@euro/ISO-8859-15 \
+@@ -253,8 +253,8 @@
+ iu_CA/UTF-8 \
iw_IL.UTF-8/UTF-8 \
iw_IL/ISO-8859-8 \
-ja_JP.EUC-JP/EUC-JP \
@@ -20,7 +22,7 @@
ka_GE.UTF-8/UTF-8 \
ka_GE/GEORGIAN-PS \
kk_KZ.UTF-8/UTF-8 \
-@@ -253,8 +253,8 @@
+@@ -263,8 +263,8 @@
kl_GL/ISO-8859-1 \
km_KH/UTF-8 \
kn_IN/UTF-8 \
@@ -30,7 +32,7 @@
ku_TR.UTF-8/UTF-8 \
ku_TR/ISO-8859-9 \
kw_GB.UTF-8/UTF-8 \
-@@ -313,8 +313,8 @@
+@@ -328,8 +328,8 @@
pt_PT@euro/ISO-8859-15 \
ro_RO.UTF-8/UTF-8 \
ro_RO/ISO-8859-2 \
@@ -40,7 +42,7 @@
ru_RU.CP1251/CP1251 \
ru_RU/ISO-8859-5 \
ru_UA.UTF-8/UTF-8 \
-@@ -375,27 +375,27 @@
+@@ -393,28 +393,28 @@
uz_UZ/ISO-8859-1 \
uz_UZ@cyrillic/UTF-8 \
ve_ZA/UTF-8 \
@@ -56,6 +58,7 @@
xh_ZA/ISO-8859-1 \
yi_US.UTF-8/UTF-8 \
yi_US/CP1255 \
+ yo_NG/UTF-8 \
+zh_CN.UTF-8/UTF-8 \
zh_CN.GB18030/GB18030 \
zh_CN.GBK/GBK \
@@ -68,7 +71,7 @@
zh_SG/GB2312 \
-zh_TW.EUC-TW/EUC-TW \
zh_TW.UTF-8/UTF-8 \
+ zh_TW/BIG5 \
+zh_TW.EUC-TW/EUC-TW \
- zh_TW/BIG5 \
zu_ZA.UTF-8/UTF-8 \
zu_ZA/ISO-8859-1 \
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-23 14:24:51 UTC (rev 2591)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-23 16:10:32 UTC (rev 2592)
@@ -4,7 +4,7 @@
localedata/locale-ku_TR.diff -p0
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff -p0
-#locale/preprocessor-collate.diff -p0
+locale/preprocessor-collate.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
locale/LC_COLLATE-keywords-ordering.diff -p0
locale/locale-print-LANGUAGE.diff -p0
@@ -42,7 +42,7 @@
localedata/nn_NO-first_weekday.diff
localedata/sk_SK-first_weekday.diff
localedata/first_weekday.diff -p0
-#localedata/sort-UTF8-first.diff -p0
+localedata/sort-UTF8-first.diff -p0
localedata/local-all-no-archive.diff -p0
# alpha/submitted-pic.diff -p0 # g: suspended
Reply to: