[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 63abb95555f56fee10505e5de0642399b062d607
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 6 23:47:57 2002 +0000

            * Downloads.subproj/WebMacBinaryDecoder.m: (+[WebMacBinaryDecoder canDecodeHeaderData:]):
    	Fix == 129 check that was supposed to be <= 129.
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2580 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5679e08..9301c25 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-11-06  Darin Adler  <darin at apple.com>
 
+        * Downloads.subproj/WebMacBinaryDecoder.m: (+[WebMacBinaryDecoder canDecodeHeaderData:]):
+	Fix == 129 check that was supposed to be <= 129.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
+2002-11-06  Darin Adler  <darin at apple.com>
+
         * Downloads.subproj/WebBinHexDecoder.m: (-[WebBinHexDecoder decodeIntoBuffer:size:]):
 	Fix an off-by-one error handling repeat counts.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5679e08..9301c25 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-11-06  Darin Adler  <darin at apple.com>
 
+        * Downloads.subproj/WebMacBinaryDecoder.m: (+[WebMacBinaryDecoder canDecodeHeaderData:]):
+	Fix == 129 check that was supposed to be <= 129.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
+2002-11-06  Darin Adler  <darin at apple.com>
+
         * Downloads.subproj/WebBinHexDecoder.m: (-[WebBinHexDecoder decodeIntoBuffer:size:]):
 	Fix an off-by-one error handling repeat counts.
 
diff --git a/WebKit/Downloads.subproj/WebMacBinaryDecoder.m b/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
index 1da5bf3..ac4236a 100644
--- a/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
+++ b/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
@@ -42,8 +42,8 @@
         // CRC matches, so we have MacBinary II or III.
         
         // Version 129 is MacBinary II, and MacBinary III is compatible.
-        // If we see any other value here, it's something newer that we can't handle.
-        if (header[123] != 129) {
+        // If we see a higher value here, it's something newer that we can't handle.
+        if (header[123] > 129) {
             return NO;
         }
         
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 8540d89..3082844 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -6,6 +6,7 @@
 "%@/%@"
 "%d"
 "%lf"
+"(This file must be converted with BinHex 4.0)"
 ","
 "."
 "/Library/Internet Plug-Ins"
@@ -25,9 +26,32 @@
 "BufferTextDrawing"
 "Courier"
 "DOCBASE"
+"DirectionAL"
+"DirectionAN"
+"DirectionB"
+"DirectionBN"
+"DirectionCS"
+"DirectionEN"
+"DirectionES"
+"DirectionET"
+"DirectionL"
+"DirectionLRE"
+"DirectionLRO"
+"DirectionNSM"
+"DirectionON"
+"DirectionPDF"
+"DirectionR"
+"DirectionRLE"
+"DirectionRLO"
+"DirectionS"
+"DirectionWS"
 "GET"
 "Helvetica"
 "IE"
+"JoiningCausing"
+"JoiningDual"
+"JoiningOther"
+"JoiningRight"
 "Joy!peff"
 "Last-Modified"
 "Library/Caches/com.apple.WebKit/Icons"
@@ -46,6 +70,9 @@
 "Times New Roman"
 "URIDictionary"
 "URLString"
+"WebActionButtonKey"
+"WebActionModifierFlagsKey"
+"WebActionNavigationTypeKey"
 "WebAuthenticationPanel"
 "WebBackForwardList:\n"
 "WebBookmarkChildrenChangedKey"

-- 
WebKit Debian packaging