Author: aurel32
Date: 2008-08-09 03:37:46 +0000 (Sat, 09 Aug 2008)
New Revision: 3055
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/patches/locale/check-unknown-symbols.diff
glibc-package/branches/glibc-2.8/debian/patches/locale/preprocessor-collate-uli-sucks.diff
glibc-package/branches/glibc-2.8/debian/patches/series
Log:
- Update locale/preprocessor-collate-uli-sucks.diff
* locale/check-unknown-symbols.diff: changes errors to warnings.
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-08 19:49:44 UTC
(rev 3054)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-09 03:37:46 UTC
(rev 3055)
@@ -8,6 +8,7 @@
+ rules.d/tarball.mk: remove all, add a get-orig-source target
+ rules.d/quilt.mk: fix the unpatch target
- Update any/submitted-i686-timing.diff.
+ - Update locale/preprocessor-collate-uli-sucks.diff
- Update localedata/tailor-iso14651_t1.diff.
- Update localedata/locales-fr.diff.
- Update localedata/cy_GB-first_weekday.diff.
@@ -65,6 +66,7 @@
* Convert all patch to patchlevel -p1. Closes: #485165.
* debian/rules.d/quilt.mk: add a refresh target.
* local/manpages/*: fix comments to make lintian happy.
+ * locale/check-unknown-symbols.diff: changes errors to warnings.
-- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 08 Aug 2008 05:48:15 +0200
Modified:
glibc-package/branches/glibc-2.8/debian/patches/locale/check-unknown-symbols.diff
===================================================================
---
glibc-package/branches/glibc-2.8/debian/patches/locale/check-unknown-symbols.diff
2008-08-08 19:49:44 UTC (rev 3054)
+++
glibc-package/branches/glibc-2.8/debian/patches/locale/check-unknown-symbols.diff
2008-08-09 03:37:46 UTC (rev 3055)
@@ -26,9 +26,9 @@
+ && find_entry (&collate->elem_table, symstr, symlen, &ptr) != 0
+ && find_entry (&collate->sym_table, symstr, symlen, &ptr) !=
0)
+ {
-+ lr_error (ldfile, _("%s: symbol `%.*s' not known"),
-+ "LC_COLLATE", (int) symlen, symstr);
-+ lr_ignore_rest (ldfile, 0);
++ if (verbose)
++ lr_error (ldfile, _("%s: symbol `%.*s' not known"),
++ "LC_COLLATE", (int) symlen, symstr);
+ }
}
else
Modified:
glibc-package/branches/glibc-2.8/debian/patches/locale/preprocessor-collate-uli-sucks.diff
===================================================================
---
glibc-package/branches/glibc-2.8/debian/patches/locale/preprocessor-collate-uli-sucks.diff
2008-08-08 19:49:44 UTC (rev 3054)
+++
glibc-package/branches/glibc-2.8/debian/patches/locale/preprocessor-collate-uli-sucks.diff
2008-08-09 03:37:46 UTC (rev 3055)
@@ -1,5 +1,5 @@
---- locale/programs/ld-collate.c.orig
-+++ locale/programs/ld-collate.c
+--- locale/programs/ld-collate.c.orig 2008-08-08 21:04:42.000000000 +0200
++++ locale/programs/ld-collate.c 2008-08-08 21:59:21.000000000 +0200
@@ -181,14 +181,6 @@
#include "3level.h"
@@ -129,7 +129,7 @@
if (nowtok == tok_copy)
{
now = lr_token (ldfile, charmap, result, NULL, verbose);
-@@ -3911,7 +3824,6 @@
+@@ -3919,7 +3832,6 @@
break;
case tok_end:
@@ -137,7 +137,7 @@
/* Next we assume `LC_COLLATE'. */
if (!ignore_content)
{
-@@ -3952,180 +3864,6 @@
+@@ -3960,182 +3872,6 @@
lr_ignore_rest (ldfile, arg->tok == tok_lc_collate);
return;
@@ -223,6 +223,8 @@
- arg->val.str.lenmb) == 0
- && curdef->str[arg->val.str.lenmb] == '\0')
- break;
+- else
+- curdef = curdef->next;
-
- if ((nowtok == tok_ifdef && curdef != NULL)
- || (nowtok == tok_ifndef && curdef == NULL))
@@ -318,7 +320,7 @@
default:
err_label:
SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
-@@ -4136,7 +3874,6 @@
+@@ -4146,7 +3882,6 @@
nowtok = now->tok;
}
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-08
19:49:44 UTC (rev 3054)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-09
03:37:46 UTC (rev 3055)
@@ -1,7 +1,7 @@
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff
-#### (temporary disabled) #### locale/preprocessor-collate-uli-sucks.diff -p0
-#### (temporary disabled) #### locale/preprocessor-collate.diff -p0 # should
not be needed anymore, but keep it anyways.
+locale/preprocessor-collate-uli-sucks.diff -p0
+locale/preprocessor-collate.diff -p0 # should not be needed anymore, but keep
it anyways.
locale/locale-print-LANGUAGE.diff
locale/LC_IDENTIFICATION-optional-fields.diff
locale/fix-C-first_weekday.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
