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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit e21c8917997036d8ed524079900d55052f8f29e9
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 28 00:18:01 2009 +0000

    2009-11-27  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Unreviewed.
    
            Move GOwnPtr* from wtf to wtf/gtk
            https://bugs.webkit.org/show_bug.cgi?id=31793
    
            Build fix for chromium after r51423.
            Exclude gtk directory from chromium build.
    
            * JavaScriptCore.gyp/JavaScriptCore.gyp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51452 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3cbe63e..f23c80b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-27  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Unreviewed. 
+
+        Move GOwnPtr* from wtf to wtf/gtk
+        https://bugs.webkit.org/show_bug.cgi?id=31793
+
+        Build fix for chromium after r51423.
+        Exclude gtk directory from chromium build.
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
 2009-11-25  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index 85fcebb..64e20a2 100644
--- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -114,7 +114,7 @@
         # ... Then include what we want.
         ['include', '../wtf/'],
         # GLib/GTK, even though its name doesn't really indicate.
-        ['exclude', '/(glib/.*)\\.(cpp|h)$'],
+        ['exclude', '/(gtk|glib)/.*\\.(cpp|h)$'],
         ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx)\\.(cpp|mm)$'],
         ['exclude', 'wtf/CurrentTime\\.cpp$'],
         ['exclude', 'wtf/TC.*\\.(cpp|h)$'],

-- 
WebKit Debian packaging