[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 ac97488e4ce898d6cfe79ef86058a5a644fa1d71
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 16 18:18:40 2004 +0000

            - fixed <rdar://problem/3696081> REGRESSION: <WebKit/CarbonUtils.h> doesn't build any more
    
            Reviewed by Trey.
    
            * Carbon.subproj/CarbonUtils.h: Fixed include. Need to include <ApplicationServices/ApplicationServices.h>
            to get CGImageRef; can't include an individual header.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.h b/WebKit/Carbon.subproj/CarbonUtils.h
index 282a113..c7a962e 100644
--- a/WebKit/Carbon.subproj/CarbonUtils.h
+++ b/WebKit/Carbon.subproj/CarbonUtils.h
@@ -9,7 +9,7 @@
 #define __HIWEBCARBONUTILS__
 
 #ifdef __OBJC__
-#import <CoreGraphics/CGImage.h>
+#import <ApplicationServices/ApplicationServices.h>
 @class NSImage;
 #endif
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 06db968..614671f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,9 +1,18 @@
+2004-06-16  Darin Adler  <darin at apple.com>
+
+        - fixed <rdar://problem/3696081> REGRESSION: <WebKit/CarbonUtils.h> doesn't build any more
+
+        Reviewed by Trey.
+
+        * Carbon.subproj/CarbonUtils.h: Fixed include. Need to include <ApplicationServices/ApplicationServices.h>
+        to get CGImageRef; can't include an individual header.
+
 2004-06-15  Richard Williamson   <rjw at apple.com>
 
-		Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
+        Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
+
+        Flip the policy for exposing Objective-C methods and properties.
 
-		Flip the policy for exposing Objective-C methods and properties.
-		
         Reviewed by Trey.
 
         * Plugins.subproj/WebPluginPackage.m:

-- 
WebKit Debian packaging