[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 14515adaaa5ac4ff9cd451e8a6a8706c800507a7
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 20 17:48:48 2003 +0000

            Reviewed by Darin
    
    	Due to some header file changes in Foundation on Panther,
    	Tweaked some includes so that WebKit builds on Jaguar
    	and Panther.
    
            * Carbon.subproj/CarbonWindowFrame.m:
            * Plugins.subproj/WebNetscapePluginPackage.m:
            * Plugins.subproj/WebPluginPackage.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowFrame.m b/WebKit/Carbon.subproj/CarbonWindowFrame.m
index aaef338..529d088 100644
--- a/WebKit/Carbon.subproj/CarbonWindowFrame.m
+++ b/WebKit/Carbon.subproj/CarbonWindowFrame.m
@@ -14,7 +14,7 @@ The class of objects that are meant to be used as _borderViews of NSCarbonWindow
 #import "CarbonWindowAdapter.h"
 #import "CarbonWindowContentView.h"
 #import <Foundation/NSGeometry.h>
-#import <Foundation/NSUtilities.h>
+#import <Foundation/NSString.h>
 #import <HIToolbox/MacWindows.h>
 #import <assert.h>
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0ed4eba..168ad1a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-20  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Due to some header file changes in Foundation on Panther, 
+	Tweaked some includes so that WebKit builds on Jaguar 
+	and Panther.
+
+        * Carbon.subproj/CarbonWindowFrame.m:
+        * Plugins.subproj/WebNetscapePluginPackage.m:
+        * Plugins.subproj/WebPluginPackage.m:
+
 2003-05-19  Maciej Stachowiak  <mjs at apple.com>
 
         - fixed 3261096 - Make WebKit an umbrella framework
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index 956e1b6..d445cb5 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -9,7 +9,13 @@
 
 #import <CoreFoundation/CFBundlePriv.h>
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+// header containing private NSBundle declarations on Jaguar
 #import <Foundation/NSBundle_Private.h>
+#else
+// header containing private NSBundle declarations on Panther
+#import <Foundation/NSPrivateDecls.h>
+#endif
 
 typedef void (* FunctionPointer) (void);
 typedef void (* TransitionVector) (void);
diff --git a/WebKit/Plugins.subproj/WebPluginPackage.m b/WebKit/Plugins.subproj/WebPluginPackage.m
index 8549a9a..a3e38de 100644
--- a/WebKit/Plugins.subproj/WebPluginPackage.m
+++ b/WebKit/Plugins.subproj/WebPluginPackage.m
@@ -10,7 +10,13 @@
 
 #import <WebKit/WebKitLogging.h>
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+// header containing private NSBundle declarations on Jaguar
 #import <Foundation/NSBundle_Private.h>
+#else
+// header containing private NSBundle declarations on Panther
+#import <Foundation/NSPrivateDecls.h>
+#endif
 
 @implementation WebPluginPackage
 

-- 
WebKit Debian packaging