r2240 - in glibc-package/branches/glibc-2.6/debian: . patches patches/any
Author: schizo
Date: 2007-05-20 00:08:48 +0000 (Sun, 20 May 2007)
New Revision: 2240
Removed:
glibc-package/branches/glibc-2.6/debian/patches/any/submitted-iconv-colon.diff
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
- Remove any/submitted-iconv-colon.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-19 23:48:26 UTC (rev 2239)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 00:08:48 UTC (rev 2240)
@@ -33,7 +33,7 @@
- Disable any/cvs-zdump-64-bit.diff (broken).
- Disable any/local-ldso-disable-hwcap.diff (broken).
- Disable any/submitted-gethostbyname_r.diff (broken).
- - Disable any/submitted-iconv-colon.diff (broken).
+ - Remove any/submitted-iconv-colon.diff (merged upstream).
- Disable any/submitted-strfry.diff (broken).
- Disable any/submitted-unistd_XOPEN_VERSION.diff (broken).
- Remove any/cvs-glob-c.diff (obsolete).
Deleted: glibc-package/branches/glibc-2.6/debian/patches/any/submitted-iconv-colon.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/any/submitted-iconv-colon.diff 2007-05-19 23:48:26 UTC (rev 2239)
+++ glibc-package/branches/glibc-2.6/debian/patches/any/submitted-iconv-colon.diff 2007-05-20 00:08:48 UTC (rev 2240)
@@ -1,22 +0,0 @@
---- iconv/gconv_charset.h 2005-12-21 08:27:27.000000000 +0100
-+++ iconv/gconv_charset.h 2007-04-22 00:57:25.000000000 +0200
-@@ -30,7 +30,7 @@
- while (*s != '\0')
- {
- if (__isalnum_l (*s, _nl_C_locobj_ptr)
-- || *s == '_' || *s == '-' || *s == '.' || *s == ',')
-+ || *s == '_' || *s == '-' || *s == '.' || *s == ',' || *s == ':')
- *wp++ = __toupper_l (*s, _nl_C_locobj_ptr);
- else if (*s == '/')
- {
---- iconv/iconv_open.c 2001-11-29 05:57:52.000000000 +0100
-+++ iconv/iconv_open.c 2007-04-22 00:59:08.000000000 +0200
-@@ -38,7 +38,7 @@
- int res;
-
- /* Normalize the name. We remove all characters beside alpha-numeric,
-- '_', '-', '/', and '.'. */
-+ '_', '-', '/', '.' and ':'. */
- tocode_len = strlen (tocode);
- tocode_conv = (char *) alloca (tocode_len + 3);
- strip (tocode_conv, tocode);
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-19 23:48:26 UTC (rev 2239)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 00:08:48 UTC (rev 2240)
@@ -130,7 +130,6 @@
any/submitted-clock-settime.diff -p0
any/submitted-date-and-unknown-tz.diff -p0
#any/submitted-gethostbyname_r.diff -p0
-#any/submitted-iconv-colon.diff -p0
#any/submitted-strfry.diff -p0
#any/submitted-unistd_XOPEN_VERSION.diff
any/local-disable-nscd-host-caching.diff
Reply to: