[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 88167e17177a9eb7aba1dc7701495f774c3c928c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 20 21:26:09 2002 +0000

    	- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
    
            * kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
    	DOSJapanese. So do what they mean, not what they say.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2107 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c295714..4782339 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-09-20  Darin Adler  <darin at apple.com>
 
+	- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
+
+        * kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
+	DOSJapanese. So do what they mean, not what they say.
+
+2002-09-20  Darin Adler  <darin at apple.com>
+
 	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
 
         * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c295714..4782339 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-09-20  Darin Adler  <darin at apple.com>
 
+	- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
+
+        * kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
+	DOSJapanese. So do what they mean, not what they say.
+
+2002-09-20  Darin Adler  <darin at apple.com>
+
 	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
 
         * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c295714..4782339 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-09-20  Darin Adler  <darin at apple.com>
 
+	- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
+
+        * kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
+	DOSJapanese. So do what they mean, not what they say.
+
+2002-09-20  Darin Adler  <darin at apple.com>
+
 	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
 
         * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 65a8134..2209470 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -99,7 +99,7 @@ DOSNordic
 DOSRussian: cp866
 DOSGreek2: ibm869
 DOSThai: cp874, dos-874, tis-620, windows-874
-DOSJapanese: cp932
+DOSJapanese: cp932, cswindows31j, shift-jis, shift_jis, x-ms-cp932, x-sjis
 DOSChineseSimplif
 DOSKorean: cp949
 DOSChineseTrad: cp950
@@ -141,7 +141,7 @@ EUC_CN: cn-gb, euc-cn, gb2312, gbk, x-euc-cn
 EUC_TW: euc-tw
 EUC_KR: euc-kr
 
-ShiftJIS: cswindows31j, shift-jis, shift_jis, x-ms-cp932, x-sjis
+ShiftJIS
 KOI8_R: koi, koi8, koi8-r, koi8r
 Big5: big5, cn-big5, x-x-big5
 MacRomanLatin1: x-mac-roman-latin1

-- 
WebKit Debian packaging