r2617 - in glibc-package/branches/glibc-2.7/debian/patches: . locale
Author: madcoder
Date: 2007-10-27 11:31:58 +0000 (Sat, 27 Oct 2007)
New Revision: 2617
Modified:
glibc-package/branches/glibc-2.7/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
Refresh LC_COLLATE-keywords-ordering.diff
Skip locale/preprocessor-collate.diff as it should not be needed anymore.
Reenable localedata patches.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.7/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-10-27 11:31:55 UTC (rev 2616)
+++ glibc-package/branches/glibc-2.7/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-10-27 11:31:58 UTC (rev 2617)
@@ -8,11 +8,9 @@
# DP: Upstream status: BZ690
# DP: Date: 2006-01-08
-Index: locale/programs/ld-collate.c
-===================================================================
---- locale/programs/ld-collate.c.orig 2007-10-23 08:52:02.000000000 -0400
-+++ locale/programs/ld-collate.c 2007-10-23 08:55:07.000000000 -0400
-@@ -2982,14 +2982,23 @@
+--- locale/programs/ld-collate.c.orig
++++ locale/programs/ld-collate.c
+@@ -2832,14 +2832,23 @@
switch (nowtok)
{
case tok_copy:
@@ -40,7 +38,7 @@
lr_ignore_rest (ldfile, 1);
break;
-@@ -3003,9 +3012,6 @@
+@@ -2853,9 +2862,6 @@
break;
}
@@ -50,7 +48,7 @@
arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_number)
goto err_label;
-@@ -3026,7 +3032,7 @@
+@@ -2876,7 +2882,7 @@
break;
}
@@ -59,7 +57,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3073,7 +3079,7 @@
+@@ -2923,7 +2929,7 @@
break;
}
@@ -68,7 +66,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3142,7 +3148,7 @@
+@@ -2992,7 +2998,7 @@
break;
}
@@ -77,7 +75,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3290,7 +3296,7 @@
+@@ -3140,7 +3146,7 @@
break;
}
@@ -86,7 +84,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3406,7 +3412,7 @@
+@@ -3256,7 +3262,7 @@
break;
}
@@ -95,7 +93,7 @@
goto err_label;
state = 1;
-@@ -3716,8 +3722,6 @@
+@@ -3566,8 +3572,6 @@
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
state = 4;
}
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 11:31:55 UTC (rev 2616)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 11:31:58 UTC (rev 2617)
@@ -1,10 +1,10 @@
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff -p0
-# locale/preprocessor-collate.diff -p0
+# locale/preprocessor-collate.diff -p0 # should not be needed anymore
locale/locale-print-LANGUAGE.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
locale/fix-C-first_weekday.diff -p0
-# locale/LC_COLLATE-keywords-ordering.diff -p0
+locale/LC_COLLATE-keywords-ordering.diff -p0
localedata/local-all-no-archive.diff -p0
localedata/sort-UTF8-first.diff -p0
localedata/supported.diff -p0
@@ -13,36 +13,36 @@
localedata/new-valencian-locale.diff -p0
localedata/locale-ku_TR.diff -p0
localedata/tl_PH-yesexpr.diff
-# localedata/fo_FO-date_fmt.diff
-# localedata/locales_CH.diff
-# localedata/locales-fr.diff
-# localedata/locales_GB.diff -p0
-# localedata/locale-en_DK.diff -p0
-# localedata/locale-csb_PL.diff
-# localedata/dz_BT-collation.diff -p0
-# localedata/locale-ia.diff -p0
-# localedata/locale-zh_TW.diff -p0
-# localedata/locale-se_NO.diff -p0
-# localedata/tailor-iso14651_t1.diff -p0
-# localedata/tailor-iso14651_t1-common.diff
-# localedata/fix-lang.diff -p0
-# localedata/cs_CZ-first_weekday.diff
-# localedata/da_DK-first_weekday.diff
-# localedata/pl_PL-first_weekday.diff
-# localedata/de_DE-first_weekday.diff
-# localedata/en_GB-first_weekday.diff
-# localedata/en_US-first_weekday.diff
-# localedata/et_EE-first_weekday.diff
-# localedata/fr_BE-first_weekday.diff
-# localedata/fr_CA-first_weekday.diff
-# localedata/fr_CH-first_weekday.diff
-# localedata/fr_FR-first_weekday.diff
-# localedata/fr_LU-first_weekday.diff
-# localedata/hu_HU-first_weekday.diff
-# localedata/nb_NO-first_weekday.diff
-# localedata/nn_NO-first_weekday.diff
-# localedata/sk_SK-first_weekday.diff
-# localedata/first_weekday.diff -p0
+localedata/fo_FO-date_fmt.diff
+localedata/locales_CH.diff
+localedata/locales-fr.diff
+localedata/locales_GB.diff -p0
+localedata/locale-en_DK.diff -p0
+localedata/locale-csb_PL.diff
+localedata/dz_BT-collation.diff -p0
+localedata/locale-ia.diff -p0
+localedata/locale-zh_TW.diff -p0
+localedata/locale-se_NO.diff -p0
+localedata/tailor-iso14651_t1.diff -p0
+localedata/tailor-iso14651_t1-common.diff
+localedata/fix-lang.diff -p0
+localedata/cs_CZ-first_weekday.diff
+localedata/da_DK-first_weekday.diff
+localedata/pl_PL-first_weekday.diff
+localedata/de_DE-first_weekday.diff
+localedata/en_GB-first_weekday.diff
+localedata/en_US-first_weekday.diff
+localedata/et_EE-first_weekday.diff
+localedata/fr_BE-first_weekday.diff
+localedata/fr_CA-first_weekday.diff
+localedata/fr_CH-first_weekday.diff
+localedata/fr_FR-first_weekday.diff
+localedata/fr_LU-first_weekday.diff
+localedata/hu_HU-first_weekday.diff
+localedata/nb_NO-first_weekday.diff
+localedata/nn_NO-first_weekday.diff
+localedata/sk_SK-first_weekday.diff
+localedata/first_weekday.diff -p0
alpha/local-gcc4.1.diff -p0
alpha/submitted-xstat.diff -p0
Reply to: