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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 18c86ed65a8f7b407bbaafb619f3b614f1e8e674
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 09:06:13 2010 +0000

    2010-09-09  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Unreviewed build fix.
    
            [EFL] Fix duplicate gstreamer macro in CMakeListEfl.txt
            https://bugs.webkit.org/show_bug.cgi?id=45433
    
            In WebKit/efl/CMakeListEfl.txt, duplicated ENABLE_VIDEO macros were added.
            So, unnecessary ENABLE_VIDEO macro is deleted.
    
            * CMakeListsEfl.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67071 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 107d995..2ea5ee5 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -24,16 +24,6 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
 IF (ENABLE_VIDEO)
 LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/gstreamer"
-    ${Gstreamer-App_INCLUDE_DIRS}
-    ${Gstreamer-Interfaces_INCLUDE_DIRS}
-    ${Gstreamer-Pbutils_INCLUDE_DIRS}
-    ${Gstreamer-Video_INCLUDE_DIRS}
-)
-ENDIF()
-
-IF (ENABLE_VIDEO)
-LIST(APPEND WebKit_INCLUDE_DIRECTORIES
-    "${WEBCORE_DIR}/platform/graphics/gstreamer"
     ${GStreamer-App_INCLUDE_DIRS}
     ${GStreamer-Interfaces_INCLUDE_DIRS}
     ${GStreamer-Pbutils_INCLUDE_DIRS}
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 9709c98..c7787b3 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-09  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Unreviewed build fix.
+
+        [EFL] Fix duplicate gstreamer macro in CMakeListEfl.txt
+        https://bugs.webkit.org/show_bug.cgi?id=45433
+
+        In WebKit/efl/CMakeListEfl.txt, duplicated ENABLE_VIDEO macros were added.
+        So, unnecessary ENABLE_VIDEO macro is deleted.
+
+        * CMakeListsEfl.txt:
+
 2010-09-08  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Unreviewed build fix.

-- 
WebKit Debian packaging