[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 81dc6ae8fcaf7986f2d5670a6efcf77c6edcb087
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 13 17:06:55 2002 +0000

    	- fixed 3023439 -- support for windows-874 charset for thai
    
            * kwq/character-sets.txt: Added cp874 and windows-874.
            * kwq/make-charset-table.pl: Fix bug where it would right out a bad MIB enum for
    	the many Macintosh character sets without associated MIB numbers.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1808 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fabd08a..4193f54 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-08-13  Darin Adler  <darin at apple.com>
 
+	- fixed 3023439 -- support for windows-874 charset for thai
+
+        * kwq/character-sets.txt: Added cp874 and windows-874.
+        * kwq/make-charset-table.pl: Fix bug where it would right out a bad MIB enum for
+	the many Macintosh character sets without associated MIB numbers.
+
+2002-08-13  Darin Adler  <darin at apple.com>
+
 	Some QRegion fixes inspired by Dave's clipping work.
 
         * kwq/qt/qregion.h: Add setClip, remove getNSBezierPath.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fabd08a..4193f54 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-08-13  Darin Adler  <darin at apple.com>
 
+	- fixed 3023439 -- support for windows-874 charset for thai
+
+        * kwq/character-sets.txt: Added cp874 and windows-874.
+        * kwq/make-charset-table.pl: Fix bug where it would right out a bad MIB enum for
+	the many Macintosh character sets without associated MIB numbers.
+
+2002-08-13  Darin Adler  <darin at apple.com>
+
 	Some QRegion fixes inspired by Dave's clipping work.
 
         * kwq/qt/qregion.h: Add setClip, remove getNSBezierPath.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fabd08a..4193f54 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-08-13  Darin Adler  <darin at apple.com>
 
+	- fixed 3023439 -- support for windows-874 charset for thai
+
+        * kwq/character-sets.txt: Added cp874 and windows-874.
+        * kwq/make-charset-table.pl: Fix bug where it would right out a bad MIB enum for
+	the many Macintosh character sets without associated MIB numbers.
+
+2002-08-13  Darin Adler  <darin at apple.com>
+
 	Some QRegion fixes inspired by Dave's clipping work.
 
         * kwq/qt/qregion.h: Add setClip, remove getNSBezierPath.
diff --git a/WebCore/kwq/character-sets.txt b/WebCore/kwq/character-sets.txt
index 38dedc7..7758112 100644
--- a/WebCore/kwq/character-sets.txt
+++ b/WebCore/kwq/character-sets.txt
@@ -6,6 +6,7 @@ CHARACTER SETS
 (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) 
+(Apple Changes: added cp874 and windows-874 aliases for TIS-620, 2002 August 13) 
 
 These are the official names for character sets that may be used in
 the Internet and may be referred to in Internet documentation.  These
@@ -1637,6 +1638,8 @@ Alias: None
 Name: TIS-620
 MIBenum: 2259
 Source: Thai Industrial Standards Institute (TISI)	     [Tantsetthi]
+Alias: cp874
+Alias: windows-874
 
 Name: HZ-GB-2312
 MIBenum: 2085
diff --git a/WebCore/kwq/make-charset-table.pl b/WebCore/kwq/make-charset-table.pl
index d9ee2e8..ef110cd 100755
--- a/WebCore/kwq/make-charset-table.pl
+++ b/WebCore/kwq/make-charset-table.pl
@@ -30,7 +30,7 @@ sub emit_line
     my ($name, $mibNum, $encodingNum) = @_;
     print TABLE ",\n" if ($already_wrote_one);
     print TABLE '    {"' . $name . '",' . "\n";
-    print TABLE "     " . $mib_enum . ",\n";
+    print TABLE "     " . $mibNum . ",\n";
     print TABLE "     " . $encodingNum . "}";
     $already_wrote_one = 1;
 }

-- 
WebKit Debian packaging