[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 46f3aa46c4a71bf94e7368da501998ee4c1532d8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 19:37:39 2011 +0000

    2011-01-03  Benjamin C Meyer  <bmeyer at rim.com>
    
            Reviewed by Daniel Bates.
    
            In the cmake build system move logic related to ENABLE_NOTIFICATIONS into its own block.
            https://bugs.webkit.org/show_bug.cgi?id=51827
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74916 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 919a6a4..5f710db 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -312,9 +312,6 @@ SET(WebCore_IDL_FILES
 
     loader/appcache/DOMApplicationCache.idl
 
-    notifications/Notification.idl
-    notifications/NotificationCenter.idl
-
     page/BarInfo.idl
     page/Console.idl
     page/Coordinates.idl
@@ -632,7 +629,6 @@ SET(WebCore_SOURCES
     bindings/js/JSDataGridDataSource.cpp
     bindings/js/JSDebugWrapperSet.cpp
     bindings/js/JSDedicatedWorkerContextCustom.cpp
-    bindings/js/JSDesktopNotificationsCustom.cpp
     bindings/js/JSDeviceMotionEventCustom.cpp
     bindings/js/JSDeviceOrientationEventCustom.cpp
     bindings/js/JSDocumentCustom.cpp
@@ -1718,6 +1714,16 @@ ELSE ()
     )
 ENDIF ()
 
+IF (ENABLE_NOTIFICATIONS)
+    LIST(APPEND WebCore_SOURCES
+        bindings/js/JSDesktopNotificationsCustom.cpp
+    )
+    LIST(APPEND WebCore_IDL_FILES
+        notifications/Notification.idl
+        notifications/NotificationCenter.idl
+    )
+ENDIF ()
+
 if (ENABLE_FILE_SYSTEM)
     LIST(APPEND WebCore_SOURCES
         bindings/js/JSDirectoryEntryCustom.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6cbbeef..b4db4fa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-03  Benjamin C Meyer  <bmeyer at rim.com>
+
+        Reviewed by Daniel Bates.
+
+        In the cmake build system move logic related to ENABLE_NOTIFICATIONS into its own block.
+        https://bugs.webkit.org/show_bug.cgi?id=51827
+
+        * CMakeLists.txt:
+
 2011-01-03  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.

-- 
WebKit Debian packaging