[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2561 - in glibc-package/trunk/debian: . local/manpages patches/any



Author: aurel32
Date: 2007-09-13 15:05:43 +0000 (Thu, 13 Sep 2007)
New Revision: 2561

Added:
   glibc-package/trunk/debian/patches/any/submitted-regex-collate.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/local/manpages/locale-gen.8
   glibc-package/trunk/debian/local/manpages/locale-gen.8.sgml
Log:
  * debian/local/manpages/locale-gen.8: fix manpage.  Closes: #442104.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-09-13 14:54:39 UTC (rev 2560)
+++ glibc-package/trunk/debian/changelog	2007-09-13 15:05:43 UTC (rev 2561)
@@ -11,8 +11,9 @@
     #442101.
   * any/submitted-regex-collate.diff: fix regex engine for multibyte
     characters and C collation.  Closes: #441355.
+  * debian/local/manpages/locale-gen.8: fix manpage.  Closes: #442104.
 
- -- Aurelien Jarno <aurel32@debian.org>  Thu, 13 Sep 2007 16:52:56 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 13 Sep 2007 17:05:17 +0200
 
 glibc (2.6.1-3) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/local/manpages/locale-gen.8
===================================================================
--- glibc-package/trunk/debian/local/manpages/locale-gen.8	2007-09-13 14:54:39 UTC (rev 2560)
+++ glibc-package/trunk/debian/local/manpages/locale-gen.8	2007-09-13 15:05:43 UTC (rev 2561)
@@ -88,7 +88,7 @@
  
 .SH "SEE ALSO" 
 .PP 
-localedef (1), locale (1), locale.gen (5). 
+localedef(1), locale(1), locale.gen(5). 
 .SH "AUTHOR" 
 .PP 
 This manual page was written by Eduard Bloch <blade@debian.org> for 

Modified: glibc-package/trunk/debian/local/manpages/locale-gen.8.sgml
===================================================================
--- glibc-package/trunk/debian/local/manpages/locale-gen.8.sgml	2007-09-13 14:54:39 UTC (rev 2560)
+++ glibc-package/trunk/debian/local/manpages/locale-gen.8.sgml	2007-09-13 15:05:43 UTC (rev 2561)
@@ -112,7 +112,7 @@
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>localedef (1), locale (1), locale.alias (5), locale.gen (5).</para>
+    <para>localedef(1), locale(1), locale.alias(5), locale.gen(5).</para>
 
   </refsect1>
 

Added: glibc-package/trunk/debian/patches/any/submitted-regex-collate.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-regex-collate.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-regex-collate.diff	2007-09-13 15:05:43 UTC (rev 2561)
@@ -0,0 +1,17 @@
+2007-09-13  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* posix/regcomp.c (lookup_collation_sequence_value): check that
+	nrules != 0 for multibyte chars.
+
+--- libc/posix/regcomp.c
++++ libc/posix/regcomp.c
+@@ -2771,7 +2771,8 @@
+ 	}
+       else if (br_elem->type == MB_CHAR)
+ 	{
+-	  return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
++	  if (nrules != 0)
++	    return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
+ 	}
+       else if (br_elem->type == COLL_SYM)
+ 	{



Reply to: