[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 6c5d5391832f85c9ade08d1b31e375da6f3d5b78
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 00:37:26 2004 +0000

            Reviewed by me
    
            * copy-webcore-files-to-webkit: Dumb typing error on my part in making
    	my previous quick fix. This quick fix works.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6148 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index af60d01..d176cb5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-01  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me
+
+        * copy-webcore-files-to-webkit: Dumb typing error on my part in making
+	my previous quick fix. This quick fix works. 
+
 2004-03-01  Chris Blumenberg  <cblu at apple.com>
 
 	Updated the WebKit project file to 1.1 because a previous check-in reverted to 1.01.
diff --git a/WebKit/DOM.subproj/DOM.h b/WebKit/DOM.subproj/DOM.h
index 1795c1f..f997918 100644
--- a/WebKit/DOM.subproj/DOM.h
+++ b/WebKit/DOM.subproj/DOM.h
@@ -23,6 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#import <Foundation/Foundation.h>
+
 //=========================================================================
 //=========================================================================
 //=========================================================================
@@ -71,28 +73,27 @@ enum DOMErrorCode {
 
 extern NSString * const DOMErrorDomain;
 
- at class NSError;
- at class NSString;
-
- at class DOMNode;
- at class DOMNamedNodeMap;
- at class DOMNodeList;
- at class DOMDocumentFragment;
- at class DOMDocument;
- at class DOMCharacterData;
 @class DOMAttr;
- at class DOMElement;
- at class DOMText;
- at class DOMComment;
 @class DOMCDATASection;
+ at class DOMComment;
+ at class DOMDocument;
 @class DOMDocumentType;
- at class DOMNotation;
- at class DOMEntity;
+ at class DOMElement;
 @class DOMEntityReference;
+ at class DOMNamedNodeMap;
+ at class DOMNodeList;
 @class DOMProcessingInstruction;
- at class DOMRange;
+ at class DOMText;
+
+typedef struct DOMObjectInternal DOMObjectInternal;
 
- at interface DOMNode : NSObject <NSCopying>
+ at interface DOMObject : NSObject <NSCopying>
+{
+    DOMObjectInternal *_internal;
+}
+ at end
+
+ at interface DOMNode : DOMObject
 - (NSString *)nodeName;
 - (NSString *)nodeValue;
 - (void)setNodeValue:(NSString *)string error:(NSError **)error;
@@ -121,7 +122,7 @@ extern NSString * const DOMErrorDomain;
 - (NSString *)HTMLString;
 @end
 
- at interface DOMNamedNodeMap : NSObject <NSCopying>
+ at interface DOMNamedNodeMap : DOMObject
 - (DOMNode *)getNamedItem:(NSString *)name;
 - (DOMNode *)setNamedItem:(DOMNode *)arg error:(NSError **)error;
 - (DOMNode *)removeNamedItem:(NSString *)name error:(NSError **)error;
@@ -133,13 +134,13 @@ extern NSString * const DOMErrorDomain;
 @end
 
 
- at interface DOMNodeList : NSObject <NSCopying>
+ at interface DOMNodeList : DOMObject
 - (DOMNode *)item:(unsigned long)index;
 - (unsigned long)length;
 @end
 
 
- at interface DOMImplementation : NSObject <NSCopying>
+ at interface DOMImplementation : DOMObject
 - (BOOL)hasFeature:(NSString *)feature :(NSString *)version;
 - (DOMDocumentType *)createDocumentType:(NSString *)qualifiedName :(NSString *)publicId :(NSString *)systemId error:(NSError **)error;
 - (DOMDocument *)createDocument:(NSString *)namespaceURI :(NSString *)qualifiedName :(DOMDocumentType *)doctype error:(NSError **)error;
@@ -267,7 +268,7 @@ enum DOMCompareHow
     DOMCompareEndToStart   = 3,
 };
 
- at interface DOMRange : NSObject
+ at interface DOMRange : DOMObject
 - (DOMNode *)startContainer:(NSError **)error;
 - (long)startOffset:(NSError **)error;
 - (DOMNode *)endContainer:(NSError **)error;
@@ -293,4 +294,3 @@ enum DOMCompareHow
 - (NSString *)toString:(NSError **)error;
 - (void)detach:(NSError **)error;
 @end
-
diff --git a/WebKit/copy-webcore-files-to-webkit b/WebKit/copy-webcore-files-to-webkit
index db1490e..9e5e978 100755
--- a/WebKit/copy-webcore-files-to-webkit
+++ b/WebKit/copy-webcore-files-to-webkit
@@ -52,7 +52,7 @@ sub AssertWebCoreFound {
 		# ok...WebCore is where we expect it
 		$WebCorePath = $localpath;
 	}
-	if (-d $builditpath) {
+	elsif (-d $builditpath) {
 		# ok...WebCore is where we expect it
 		$WebCorePath = $builditpath;
 	}

-- 
WebKit Debian packaging