r901 - in /unstable/evolution-data-server/debian: changelog patches/30_iconv-gb2312-gb18030.patch

[oysteigi-guest at users.alioth.debian.org]

Author: oysteigi-guest
Date: Mon Oct 22 08:46:10 2007
New Revision: 901

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=901
Log:
* 30_iconv-gb2312-gb18030.patch: Use gb18030 which is a superset of gb2312
  to decode gb2312. Thanks to Darren Hoo. (closes: #447233)

Added:
    unstable/evolution-data-server/debian/patches/30_iconv-gb2312-gb18030.patch
Modified:
    unstable/evolution-data-server/debian/changelog

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=901&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Mon Oct 22 08:46:10 2007
@@ -1,4 +1,4 @@
-evolution-data-server (1.12.1-0) unstable; urgency=low
+evolution-data-server (1.12.1-1) unstable; urgency=low
 
   [ Heikki Henriksen ]
   * libedataserverui1.2-8 needs files from /usr/share/evolution-data-se
@@ -6,8 +6,10 @@
 
   [ Oystein Gisnas ]
   * New upstream release
-
- -- Oystein Gisnas <oystein at gisnas.net>  Sun, 21 Oct 2007 19:30:19 +0200
+  * 30_iconv-gb2312-gb18030.patch: Use gb18030 which is a superset of gb2312
+    to decode gb2312. Thanks to Darren Hoo. (closes: #447233)
+
+ -- Oystein Gisnas <oystein at gisnas.net>  Mon, 22 Oct 2007 10:45:32 +0200
 
 evolution-data-server (1.12.0-1) unstable; urgency=low
 

Added: unstable/evolution-data-server/debian/patches/30_iconv-gb2312-gb18030.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/30_iconv-gb2312-gb18030.patch?rev=901&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/30_iconv-gb2312-gb18030.patch (added)
+++ unstable/evolution-data-server/debian/patches/30_iconv-gb2312-gb18030.patch Mon Oct 22 08:46:10 2007
@@ -1,0 +1,26 @@
+--- libedataserver/e-iconv.c.orig	2007-10-22 10:29:56.587916703 +0200
++++ libedataserver/e-iconv.c	2007-10-22 10:37:22.113305748 +0200
+@@ -135,15 +135,18 @@
+ 	{ "euckr-0",        "EUC-KR"     },
+ 	{ "5601",           "EUC-KR"     },
+ 	{ "zh_TW-euc",      "EUC-TW"     },
+-	{ "zh_CN.euc",      "gb2312"     },
++	{ "zh_CN.euc",      "gb18030"    },
+ 	{ "zh_TW-big5",     "BIG5"       },
+-	{ "euc-cn",         "gb2312"     },
++	{ "euc-cn",         "gb18030"    },
+ 	{ "big5-0",         "BIG5"       },
+ 	{ "big5.eten-0",    "BIG5"       },
+ 	{ "big5hkscs-0",    "BIG5HKSCS"  },
+-	{ "gb2312-0",       "gb2312"     },
+-	{ "gb2312.1980-0",  "gb2312"     },
+-	{ "gb-2312",        "gb2312"     },
++	/* Also treat gb2312 as gb18030 to cope with user agents that encode */
++	/* gb18030 characters as gb2312 (MS) */
++	{ "gb2312-0",       "gb18030"    },
++	{ "gb2312.1980-0",  "gb18030"    },
++	{ "gb-2312",        "gb18030"    },
++	{ "gb2312",         "gb18030"    },
+ 	{ "gb18030-0",      "gb18030"    },
+ 	{ "gbk-0",          "GBK"        },
+