[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[sfalken at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 0c911fe3d9bb6d31d94120bde8c509a661710303
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 23 02:53:56 2010 +0000

    Build fix. Don't include CoreLocation-based Geolocation if CLIENT_BASED_GEOLOCATION is set.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53750 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/platform/mac/GeolocationServiceMac.mm b/WebCore/platform/mac/GeolocationServiceMac.mm
index 1093e69..9c781ad 100644
--- a/WebCore/platform/mac/GeolocationServiceMac.mm
+++ b/WebCore/platform/mac/GeolocationServiceMac.mm
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if ENABLE(GEOLOCATION)
+#if ENABLE(GEOLOCATION) && !ENABLE(CLIENT_BASED_GEOLOCATION)
 
 #import "GeolocationServiceMac.h"
 

-- 
WebKit Debian packaging