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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2eaa7158094ec7e19c59e493faef74d4e16dfa10
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 07:05:49 2010 +0000

    2010-12-02  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Eric Seidel.
    
            [EFL] Fails to build with non-system cairo
            https://bugs.webkit.org/show_bug.cgi?id=50395
    
            Do not add 'cairo' as a suffix for the paths provided by
            pkgconfig. The paths provided by pkgconfig already include it.
    
            * cmake/FindCairo.cmake:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1e676ee..42e9967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-02  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Eric Seidel.
+
+        [EFL] Fails to build with non-system cairo
+        https://bugs.webkit.org/show_bug.cgi?id=50395
+
+        Do not add 'cairo' as a suffix for the paths provided by
+        pkgconfig. The paths provided by pkgconfig already include it.
+
+        * cmake/FindCairo.cmake:
+
 2010-12-02  Xan Lopez  <xlopez at igalia.com>
 
         Third attempt to fix the build.
diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake
index acde22e..db8981e 100644
--- a/cmake/FindCairo.cmake
+++ b/cmake/FindCairo.cmake
@@ -17,7 +17,6 @@ libfind_pkg_check_modules(Cairo_PKGCONF cairo)
 find_path(Cairo_INCLUDE_DIR
   NAMES cairo.h
   PATHS ${Cairo_PKGCONF_INCLUDE_DIRS}
-  PATH_SUFFIXES cairo
 )
 
 # Finally the library itself

-- 
WebKit Debian packaging