[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 9c3d8bd7ea268f3ad07cbf4f60bac529239d339b
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 21:20:40 2010 +0000

    2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] [Symbian] Do not use pkg-config on Symbian as it is not supported
            https://bugs.webkit.org/show_bug.cgi?id=50231
    
            Guard CONFIG+=link_pkgconfig with !symbian.
    
            * jsc.pro:
    2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] [Symbian] Do not use pkg-config on Symbian as it is not supported
            https://bugs.webkit.org/show_bug.cgi?id=50231
    
            No new tests as there is no new functionality.
    
            Guard CONFIG+=link_pkgconfig with !symbian.
    
            * WebCore.pro:
    2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] [Symbian] Do not use pkg-config on Symbian as it is not supported
            https://bugs.webkit.org/show_bug.cgi?id=50231
    
            Guard CONFIG+=link_pkgconfig with !symbian.
    
            * DumpRenderTree/qt/DumpRenderTree.pro:
            * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
            * WebKitTestRunner/qt/WebKitTestRunner.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 96f854b..9171997 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] [Symbian] Do not use pkg-config on Symbian as it is not supported
+        https://bugs.webkit.org/show_bug.cgi?id=50231
+
+        Guard CONFIG+=link_pkgconfig with !symbian.
+
+        * jsc.pro:
+
 2010-12-14  Cameron Zwarich  <zwarich at apple.com>
 
         Not reviewed.
diff --git a/JavaScriptCore/jsc.pro b/JavaScriptCore/jsc.pro
index 670ca61..b4db812 100644
--- a/JavaScriptCore/jsc.pro
+++ b/JavaScriptCore/jsc.pro
@@ -11,7 +11,7 @@ win32-msvc*: CONFIG += exceptions_off stl_off
 isEmpty(OUTPUT_DIR): OUTPUT_DIR= ..
 include($$PWD/../WebKit.pri)
 
-CONFIG += link_pkgconfig
+unix:!mac:!symbian:CONFIG += link_pkgconfig
 
 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b7e85f5..e9da393 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] [Symbian] Do not use pkg-config on Symbian as it is not supported
+        https://bugs.webkit.org/show_bug.cgi?id=50231
+
+        No new tests as there is no new functionality.
+
+        Guard CONFIG+=link_pkgconfig with !symbian.
+
+        * WebCore.pro:
+
 2010-12-14  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r74040.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 6d5b4d7..f970de2 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -3277,7 +3277,7 @@ contains(DEFINES, ENABLE_XPATH=1) {
         xml/XPathVariableReference.cpp
 }
 
-unix:!mac:CONFIG += link_pkgconfig
+unix:!mac:!symbian:CONFIG += link_pkgconfig
 
 contains(DEFINES, ENABLE_XSLT=1) {
     tobe|!tobe: QT += xmlpatterns
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3ac6c66..61bed23 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] [Symbian] Do not use pkg-config on Symbian as it is not supported
+        https://bugs.webkit.org/show_bug.cgi?id=50231
+
+        Guard CONFIG+=link_pkgconfig with !symbian.
+
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+        * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
 2010-12-14  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
index 54d5af7..e8831a3 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -12,7 +12,7 @@ INCLUDEPATH += ../../../JavaScriptCore/ForwardingHeaders
 INCLUDEPATH += $$BASEDIR
 DESTDIR = ../../../bin
 
-unix:!mac {
+unix:!mac:!symbian {
     CONFIG += link_pkgconfig
     PKGCONFIG += fontconfig
 }
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
index 2b3cbaf..f7d0989 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
@@ -67,7 +67,7 @@ INCLUDEPATH += \
 PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h
 QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
 
-unix:!mac {
+unix:!mac:!symbian {
     CONFIG += link_pkgconfig
     PKGCONFIG += fontconfig
 }
diff --git a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
index f43bb0e..cf5d5b8 100644
--- a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -31,7 +31,7 @@ INCLUDEPATH += \
 
 DESTDIR = $$OUTPUT_DIR/bin
 
-unix:!mac {
+unix:!mac:!symbian {
     CONFIG += link_pkgconfig
     PKGCONFIG += fontconfig
 }

-- 
WebKit Debian packaging