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

abarth at webkit.org abarth at webkit.org
Fri Jan 21 14:42:49 UTC 2011 

The following commit has been merged in the debian/experimental branch:
commit e6c5b11889da73862a0f160ea6b09fb4c253f503
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 27 07:00:42 2010 +0000

    2010-12-26  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Move cmake into Sources
            https://bugs.webkit.org/show_bug.cgi?id=51631
    
            * PrettyPatch/PrettyPatch.rb:
    2010-12-26  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Move cmake into Sources
            https://bugs.webkit.org/show_bug.cgi?id=51631
    
            * CMakeLists.txt:
            * Sources/cmake: Copied from cmake.
            * cmake: Removed.
            * cmake/FindCFLite.cmake: Removed.
            * cmake/FindCairo.cmake: Removed.
            * cmake/FindEFL.cmake: Removed.
            * cmake/FindFontconfig.cmake: Removed.
            * cmake/FindFreetype.cmake: Removed.
            * cmake/FindGDK-PixBuf.cmake: Removed.
            * cmake/FindGDK.cmake: Removed.
            * cmake/FindGIO.cmake: Removed.
            * cmake/FindGStreamer-App.cmake: Removed.
            * cmake/FindGStreamer-Base.cmake: Removed.
            * cmake/FindGStreamer-Interfaces.cmake: Removed.
            * cmake/FindGStreamer-Pbutils.cmake: Removed.
            * cmake/FindGStreamer-Plugins-Base.cmake: Removed.
            * cmake/FindGStreamer-Video.cmake: Removed.
            * cmake/FindGStreamer.cmake: Removed.
            * cmake/FindGlib.cmake: Removed.
            * cmake/FindGperf.cmake: Removed.
            * cmake/FindGthread.cmake: Removed.
            * cmake/FindICU.cmake: Removed.
            * cmake/FindLibSoup2.cmake: Removed.
            * cmake/FindLibXlst.cmake: Removed.
            * cmake/FindPango.cmake: Removed.
            * cmake/FindSqlite.cmake: Removed.
            * cmake/LibFindMacros.cmake: Removed.
            * cmake/OptionsCommon.cmake: Removed.
            * cmake/OptionsEfl.cmake: Removed.
            * cmake/OptionsWinCE.cmake: Removed.
            * cmake/OptionsWindows.cmake: Removed.
            * cmake/WebKitEfl.cmake: Removed.
            * cmake/WebKitFS.cmake: Removed.
            * cmake/WebKitFeatures.cmake: Removed.
            * cmake/WebKitHelpers.cmake: Removed.
            * cmake/WebKitMacros.cmake: Removed.
            * cmake/WebKitPackaging.cmake: Removed.
            * cmake/eflsymbols.filter: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 897120c..cebebe6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ PROJECT(WebKit)
 IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
     SET(CMAKE_BUILD_TYPE Release)
 ENDIF ()
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Sources/cmake")
 
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
diff --git a/ChangeLog b/ChangeLog
index cdd7e44..3dca706 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,51 @@
 2010-12-26  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        Move cmake into Sources
+        https://bugs.webkit.org/show_bug.cgi?id=51631
+
+        * CMakeLists.txt:
+        * Sources/cmake: Copied from cmake.
+        * cmake: Removed.
+        * cmake/FindCFLite.cmake: Removed.
+        * cmake/FindCairo.cmake: Removed.
+        * cmake/FindEFL.cmake: Removed.
+        * cmake/FindFontconfig.cmake: Removed.
+        * cmake/FindFreetype.cmake: Removed.
+        * cmake/FindGDK-PixBuf.cmake: Removed.
+        * cmake/FindGDK.cmake: Removed.
+        * cmake/FindGIO.cmake: Removed.
+        * cmake/FindGStreamer-App.cmake: Removed.
+        * cmake/FindGStreamer-Base.cmake: Removed.
+        * cmake/FindGStreamer-Interfaces.cmake: Removed.
+        * cmake/FindGStreamer-Pbutils.cmake: Removed.
+        * cmake/FindGStreamer-Plugins-Base.cmake: Removed.
+        * cmake/FindGStreamer-Video.cmake: Removed.
+        * cmake/FindGStreamer.cmake: Removed.
+        * cmake/FindGlib.cmake: Removed.
+        * cmake/FindGperf.cmake: Removed.
+        * cmake/FindGthread.cmake: Removed.
+        * cmake/FindICU.cmake: Removed.
+        * cmake/FindLibSoup2.cmake: Removed.
+        * cmake/FindLibXlst.cmake: Removed.
+        * cmake/FindPango.cmake: Removed.
+        * cmake/FindSqlite.cmake: Removed.
+        * cmake/LibFindMacros.cmake: Removed.
+        * cmake/OptionsCommon.cmake: Removed.
+        * cmake/OptionsEfl.cmake: Removed.
+        * cmake/OptionsWinCE.cmake: Removed.
+        * cmake/OptionsWindows.cmake: Removed.
+        * cmake/WebKitEfl.cmake: Removed.
+        * cmake/WebKitFS.cmake: Removed.
+        * cmake/WebKitFeatures.cmake: Removed.
+        * cmake/WebKitHelpers.cmake: Removed.
+        * cmake/WebKitMacros.cmake: Removed.
+        * cmake/WebKitPackaging.cmake: Removed.
+        * cmake/eflsymbols.filter: Removed.
+
+2010-12-26  Adam Barth  <abarth at webkit.org>
+
         Fix some references to the old location of the WebKit website in git
         metadata files.
 
diff --git a/cmake/FindCFLite.cmake b/Sources/cmake/FindCFLite.cmake
similarity index 100%
rename from cmake/FindCFLite.cmake
rename to Sources/cmake/FindCFLite.cmake
diff --git a/cmake/FindCairo.cmake b/Sources/cmake/FindCairo.cmake
similarity index 100%
rename from cmake/FindCairo.cmake
rename to Sources/cmake/FindCairo.cmake
diff --git a/cmake/FindEFL.cmake b/Sources/cmake/FindEFL.cmake
similarity index 100%
rename from cmake/FindEFL.cmake
rename to Sources/cmake/FindEFL.cmake
diff --git a/cmake/FindFontconfig.cmake b/Sources/cmake/FindFontconfig.cmake
similarity index 100%
rename from cmake/FindFontconfig.cmake
rename to Sources/cmake/FindFontconfig.cmake
diff --git a/cmake/FindFreetype.cmake b/Sources/cmake/FindFreetype.cmake
similarity index 100%
rename from cmake/FindFreetype.cmake
rename to Sources/cmake/FindFreetype.cmake
diff --git a/cmake/FindGDK-PixBuf.cmake b/Sources/cmake/FindGDK-PixBuf.cmake
similarity index 100%
rename from cmake/FindGDK-PixBuf.cmake
rename to Sources/cmake/FindGDK-PixBuf.cmake
diff --git a/cmake/FindGDK.cmake b/Sources/cmake/FindGDK.cmake
similarity index 100%
rename from cmake/FindGDK.cmake
rename to Sources/cmake/FindGDK.cmake
diff --git a/cmake/FindGIO.cmake b/Sources/cmake/FindGIO.cmake
similarity index 100%
rename from cmake/FindGIO.cmake
rename to Sources/cmake/FindGIO.cmake
diff --git a/cmake/FindGStreamer-App.cmake b/Sources/cmake/FindGStreamer-App.cmake
similarity index 100%
rename from cmake/FindGStreamer-App.cmake
rename to Sources/cmake/FindGStreamer-App.cmake
diff --git a/cmake/FindGStreamer-Base.cmake b/Sources/cmake/FindGStreamer-Base.cmake
similarity index 100%
rename from cmake/FindGStreamer-Base.cmake
rename to Sources/cmake/FindGStreamer-Base.cmake
diff --git a/cmake/FindGStreamer-Interfaces.cmake b/Sources/cmake/FindGStreamer-Interfaces.cmake
similarity index 100%
rename from cmake/FindGStreamer-Interfaces.cmake
rename to Sources/cmake/FindGStreamer-Interfaces.cmake
diff --git a/cmake/FindGStreamer-Pbutils.cmake b/Sources/cmake/FindGStreamer-Pbutils.cmake
similarity index 100%
rename from cmake/FindGStreamer-Pbutils.cmake
rename to Sources/cmake/FindGStreamer-Pbutils.cmake
diff --git a/cmake/FindGStreamer-Plugins-Base.cmake b/Sources/cmake/FindGStreamer-Plugins-Base.cmake
similarity index 100%
rename from cmake/FindGStreamer-Plugins-Base.cmake
rename to Sources/cmake/FindGStreamer-Plugins-Base.cmake
diff --git a/cmake/FindGStreamer-Video.cmake b/Sources/cmake/FindGStreamer-Video.cmake
similarity index 100%
rename from cmake/FindGStreamer-Video.cmake
rename to Sources/cmake/FindGStreamer-Video.cmake
diff --git a/cmake/FindGStreamer.cmake b/Sources/cmake/FindGStreamer.cmake
similarity index 100%
rename from cmake/FindGStreamer.cmake
rename to Sources/cmake/FindGStreamer.cmake
diff --git a/cmake/FindGlib.cmake b/Sources/cmake/FindGlib.cmake
similarity index 100%
rename from cmake/FindGlib.cmake
rename to Sources/cmake/FindGlib.cmake
diff --git a/cmake/FindGperf.cmake b/Sources/cmake/FindGperf.cmake
similarity index 100%
rename from cmake/FindGperf.cmake
rename to Sources/cmake/FindGperf.cmake
diff --git a/cmake/FindGthread.cmake b/Sources/cmake/FindGthread.cmake
similarity index 100%
rename from cmake/FindGthread.cmake
rename to Sources/cmake/FindGthread.cmake
diff --git a/cmake/FindICU.cmake b/Sources/cmake/FindICU.cmake
similarity index 100%
rename from cmake/FindICU.cmake
rename to Sources/cmake/FindICU.cmake
diff --git a/cmake/FindLibSoup2.cmake b/Sources/cmake/FindLibSoup2.cmake
similarity index 100%
rename from cmake/FindLibSoup2.cmake
rename to Sources/cmake/FindLibSoup2.cmake
diff --git a/cmake/FindLibXlst.cmake b/Sources/cmake/FindLibXlst.cmake
similarity index 100%
rename from cmake/FindLibXlst.cmake
rename to Sources/cmake/FindLibXlst.cmake
diff --git a/cmake/FindPango.cmake b/Sources/cmake/FindPango.cmake
similarity index 100%
rename from cmake/FindPango.cmake
rename to Sources/cmake/FindPango.cmake
diff --git a/cmake/FindSqlite.cmake b/Sources/cmake/FindSqlite.cmake
similarity index 100%
rename from cmake/FindSqlite.cmake
rename to Sources/cmake/FindSqlite.cmake
diff --git a/cmake/LibFindMacros.cmake b/Sources/cmake/LibFindMacros.cmake
similarity index 100%
rename from cmake/LibFindMacros.cmake
rename to Sources/cmake/LibFindMacros.cmake
diff --git a/cmake/OptionsCommon.cmake b/Sources/cmake/OptionsCommon.cmake
similarity index 100%
rename from cmake/OptionsCommon.cmake
rename to Sources/cmake/OptionsCommon.cmake
diff --git a/cmake/OptionsEfl.cmake b/Sources/cmake/OptionsEfl.cmake
similarity index 100%
rename from cmake/OptionsEfl.cmake
rename to Sources/cmake/OptionsEfl.cmake
diff --git a/cmake/OptionsWinCE.cmake b/Sources/cmake/OptionsWinCE.cmake
similarity index 100%
rename from cmake/OptionsWinCE.cmake
rename to Sources/cmake/OptionsWinCE.cmake
diff --git a/cmake/OptionsWindows.cmake b/Sources/cmake/OptionsWindows.cmake
similarity index 100%
rename from cmake/OptionsWindows.cmake
rename to Sources/cmake/OptionsWindows.cmake
diff --git a/cmake/WebKitEfl.cmake b/Sources/cmake/WebKitEfl.cmake
similarity index 100%
rename from cmake/WebKitEfl.cmake
rename to Sources/cmake/WebKitEfl.cmake
diff --git a/cmake/WebKitFS.cmake b/Sources/cmake/WebKitFS.cmake
similarity index 100%
rename from cmake/WebKitFS.cmake
rename to Sources/cmake/WebKitFS.cmake
diff --git a/cmake/WebKitFeatures.cmake b/Sources/cmake/WebKitFeatures.cmake
similarity index 100%
rename from cmake/WebKitFeatures.cmake
rename to Sources/cmake/WebKitFeatures.cmake
diff --git a/cmake/WebKitHelpers.cmake b/Sources/cmake/WebKitHelpers.cmake
similarity index 100%
rename from cmake/WebKitHelpers.cmake
rename to Sources/cmake/WebKitHelpers.cmake
diff --git a/cmake/WebKitMacros.cmake b/Sources/cmake/WebKitMacros.cmake
similarity index 100%
rename from cmake/WebKitMacros.cmake
rename to Sources/cmake/WebKitMacros.cmake
diff --git a/cmake/WebKitPackaging.cmake b/Sources/cmake/WebKitPackaging.cmake
similarity index 100%
rename from cmake/WebKitPackaging.cmake
rename to Sources/cmake/WebKitPackaging.cmake
diff --git a/cmake/eflsymbols.filter b/Sources/cmake/eflsymbols.filter
similarity index 100%
rename from cmake/eflsymbols.filter
rename to Sources/cmake/eflsymbols.filter
diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 3c01f5d..8f938c6 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-26  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move cmake into Sources
+        https://bugs.webkit.org/show_bug.cgi?id=51631
+
+        * PrettyPatch/PrettyPatch.rb:
+
 2010-12-23  Adam Barth  <abarth at webkit.org>
 
         Rubber-stamped by Eric Seidel.
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 87625c9..3e8e090 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -77,7 +77,6 @@ private
         WebKitLibraries
         Websites
         autotools
-        cmake
     ]
 
     def self.find_url_and_path(file_path)

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list