[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 5e62754ebabae852b3f48e38451300ef24c79f01
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 1 22:40:34 2002 +0000

            - fixed 2841277 -- support for charset=gb2312
    
            * kwq/character-sets.txt: Added "euc-cn" to the list of aliases for
    	"gb2312", since that's the name used by CFStringEncoding for that
    	character set.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b2156f1..760d61b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-01  Darin Adler  <darin at apple.com>
+
+        - fixed 2841277 -- support for charset=gb2312
+
+        * kwq/character-sets.txt: Added "euc-cn" to the list of aliases for
+	"gb2312", since that's the name used by CFStringEncoding for that
+	character set.
+
 2002-08-01  Maciej Stachowiak  <mjs at apple.com>
 
 	Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b2156f1..760d61b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-08-01  Darin Adler  <darin at apple.com>
+
+        - fixed 2841277 -- support for charset=gb2312
+
+        * kwq/character-sets.txt: Added "euc-cn" to the list of aliases for
+	"gb2312", since that's the name used by CFStringEncoding for that
+	character set.
+
 2002-08-01  Maciej Stachowiak  <mjs at apple.com>
 
 	Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b2156f1..760d61b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-08-01  Darin Adler  <darin at apple.com>
+
+        - fixed 2841277 -- support for charset=gb2312
+
+        * kwq/character-sets.txt: Added "euc-cn" to the list of aliases for
+	"gb2312", since that's the name used by CFStringEncoding for that
+	character set.
+
 2002-08-01  Maciej Stachowiak  <mjs at apple.com>
 
 	Remove KWQKHTMLPartImpl's setBaseURL method and m_baseURL field,
diff --git a/WebCore/kwq/character-sets.txt b/WebCore/kwq/character-sets.txt
index 2f8b64c..38dedc7 100644
--- a/WebCore/kwq/character-sets.txt
+++ b/WebCore/kwq/character-sets.txt
@@ -5,6 +5,7 @@ CHARACTER SETS
 (last updated 2001 August 23)
 (Apple Changes: added x-sjis alias for Shift JIS, 2002 July 10) 
 (Apple Changes: added MIBenum: 1004 for ISO-10646-J-1, 2002 July 26) 
+(Apple Changes: added euc-cn alias for GB2312, 2002 August 1) 
 
 These are the official names for character sets that may be used in
 the Internet and may be referred to in Internet documentation.  These
@@ -1580,6 +1581,7 @@ Source: Chinese for People's Republic of China (PRC) mixed one byte,
         See GB 2312-80 
         PCL Symbol Set Id: 18C
 Alias: csGB2312
+Alias: euc-cn
 
 Name: Big5  (preferred MIME name)
 MIBenum: 2026

-- 
WebKit Debian packaging