[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 5500a74c1d6bfed1e0d08eaf758ad9f44db14089
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 11 05:07:25 2002 +0000

    	- fixed 2979153 -- charset sjis page is gibberish
    
            * kwq/character-sets.txt: Add x-sjis as an alias for Shift JIS.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1531 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 02f6ec2..cc45fbc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-07-10  Darin Adler  <darin at apple.com>
 
+	- fixed 2979153 -- charset sjis page is gibberish
+
+        * kwq/character-sets.txt: Add x-sjis as an alias for Shift JIS.
+
+2002-07-10  Darin Adler  <darin at apple.com>
+
         * kwq/KWQPixmap.mm:
         (QPixmap::QPixmap): Restore the imageRenderer == nil case to fix a regression
 	related to resized images. Otherwise, isNull was returning true for all images.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 02f6ec2..cc45fbc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2002-07-10  Darin Adler  <darin at apple.com>
 
+	- fixed 2979153 -- charset sjis page is gibberish
+
+        * kwq/character-sets.txt: Add x-sjis as an alias for Shift JIS.
+
+2002-07-10  Darin Adler  <darin at apple.com>
+
         * kwq/KWQPixmap.mm:
         (QPixmap::QPixmap): Restore the imageRenderer == nil case to fix a regression
 	related to resized images. Otherwise, isNull was returning true for all images.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 02f6ec2..cc45fbc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2002-07-10  Darin Adler  <darin at apple.com>
 
+	- fixed 2979153 -- charset sjis page is gibberish
+
+        * kwq/character-sets.txt: Add x-sjis as an alias for Shift JIS.
+
+2002-07-10  Darin Adler  <darin at apple.com>
+
         * kwq/KWQPixmap.mm:
         (QPixmap::QPixmap): Restore the imageRenderer == nil case to fix a regression
 	related to resized images. Otherwise, isNull was returning true for all images.
diff --git a/WebCore/kwq/character-sets.txt b/WebCore/kwq/character-sets.txt
index 149bf70..48b449b 100644
--- a/WebCore/kwq/character-sets.txt
+++ b/WebCore/kwq/character-sets.txt
@@ -3,6 +3,7 @@
 CHARACTER SETS
 
 (last updated 2001 August 23)
+(Apple Changes: added x-sjis alias for Shift JIS 2002 July 10) 
 
 These are the official names for character sets that may be used in
 the Internet and may be referred to in Internet documentation.  These
@@ -1364,6 +1365,7 @@ Source: This charset is an extension of csHalfWidthKatakana by
         This charset can be used for the top-level media type "text".
 Alias: MS_Kanji 
 Alias: csShiftJIS
+Alias: x-sjis
 
 Name: Extended_UNIX_Code_Packed_Format_for_Japanese
 MIBenum: 18

-- 
WebKit Debian packaging