[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 c2c5b19e4f43a8062398fa41df8a91b24416d0e5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 2 18:11:58 2004 +0000

            - fixed build failure on Merlot
    
            * Misc.subproj/WebNSPasteboardExtras.m: Import just CoreTranslationFlavorTypeNames.h rather than all of
            ApplicationServicesPriv.h; should compile faster and avoid build failure.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6020 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ab12eaa..71b2355 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-02  Darin Adler  <darin at apple.com>
+
+        - fixed build failure on Merlot
+
+        * Misc.subproj/WebNSPasteboardExtras.m: Import just CoreTranslationFlavorTypeNames.h rather than all of
+        ApplicationServicesPriv.h; should compile faster and avoid build failure.
+
 2004-02-02  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3546379>: support for editing via drag & drop
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index e7deb64..241e19f 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -14,7 +14,7 @@
 #import <WebKit/WebAssertions.h>
 #import <Foundation/NSString_NSURLExtras.h>
 
-#import <ApplicationServices/ApplicationServicesPriv.h>
+#import <HIServices/CoreTranslationFlavorTypeNames.h>
 
 NSString *WebURLPboardType = nil;
 NSString *WebURLNamePboardType = nil;

-- 
WebKit Debian packaging