[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 8ea0b2338d66f8f1c2a07d8fda31832f222a7b4c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 30 23:08:20 2003 +0000

            Reviewed by John.
    
            - added "sjis" as a synonym for "Shift_JIS"; this might fix 3235161,
            HOMEPAGE: Publishing page with Japanese characters w/ Safari generates an error,
            but I am currently unable to test the fix.
    
            * kwq/mac-encodings.txt: Added sjis to the Shift_JIS line.
            * kwq/KWQCharsetData.c: Regenerated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 99350b8..cc66d6e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-05-30  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - added "sjis" as a synonym for "Shift_JIS"; this might fix 3235161,
+        HOMEPAGE: Publishing page with Japanese characters w/ Safari generates an error,
+        but I am currently unable to test the fix.
+
+        * kwq/mac-encodings.txt: Added sjis to the Shift_JIS line.
+        * kwq/KWQCharsetData.c: Regenerated.
+
 2003-05-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3263156, stack overflow at www.liceo.edu.mx.  This
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 99350b8..cc66d6e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-05-30  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - added "sjis" as a synonym for "Shift_JIS"; this might fix 3235161,
+        HOMEPAGE: Publishing page with Japanese characters w/ Safari generates an error,
+        but I am currently unable to test the fix.
+
+        * kwq/mac-encodings.txt: Added sjis to the Shift_JIS line.
+        * kwq/KWQCharsetData.c: Regenerated.
+
 2003-05-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3263156, stack overflow at www.liceo.edu.mx.  This
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index 5f34994..3dd5a88 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -233,6 +233,7 @@ static const CharsetEntry table[] = {
     { "Shift_JIS", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
     { "csshiftjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
     { "mskanji", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
+    { "sjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
     { "xsjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
     { "GB18030", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
     { "chinese", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 93a4a01..f85f4ad 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -112,7 +112,7 @@ JIS_X0208_83, IsJapanese: JIS_X0208-1983
 JIS_X0208_90, IsJapanese: JIS_X0208-1990
 JIS_X0212_90, IsJapanese: JIS_X0212-1990
 JIS_C6226_78, IsJapanese: JIS_C6226-1978
-ShiftJIS_X0213_00, IsJapanese: Shift_JIS, xsjis
+ShiftJIS_X0213_00, IsJapanese: Shift_JIS, sjis, xsjis
 GB_2312_80
 GBK_95
 GB_18030_2000: GB18030, cngb, csgb231280, euccn, gb2312, gb231280, gbk, xeuccn, xgbk

-- 
WebKit Debian packaging