[SCM] Amarok packaging branch, master, updated. debian/2.8.0-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=6bec620

The following commit has been merged in the master branch:
commit 6bec6209efef67f3fba858da4948695a24454ec2
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Aug 18 12:16:00 2013 +0300

    Revert "Patch test."
    
    This reverts commit 8f84cd49e08266ec21b20760307a1bacf3a65770.
    
    It is not needed, we neither build nor run tests for now.
---
 debian/patches/gmock_sources.diff |   50 -------------------------------------
 debian/patches/series             |    1 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/gmock_sources.diff b/debian/patches/gmock_sources.diff
deleted file mode 100644
index 1806768..0000000
--- a/debian/patches/gmock_sources.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/cmake/modules/FindGooglemock.cmake b/cmake/modules/FindGooglemock.cmake
-index 91c96bc..23194f0 100644
---- a/cmake/modules/FindGooglemock.cmake
-+++ b/cmake/modules/FindGooglemock.cmake
-@@ -104,6 +104,14 @@ if( NOT GOOGLEMOCK_DEP_GTEST_LIBRARY )
-        ${KDE4_LIB_DIR}
-     )
-     set( CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+    if( NOT GOOGLEMOCK_LIBRARY_STATIC )
-+        find_path( GOOGLEMOCK_SOURCES NAMES gmock 
-+            PATHS /usr/src
-+            NO_DEFAULT_PATH
-+            NO_CMAKE_PATH
-+        )
-+    endif( NOT GOOGLEMOCK_LIBRARY_STATIC )
- endif( NOT GOOGLEMOCK_DEP_GTEST_LIBRARY )
- 
- # -- googlemock and gtest library available
-@@ -120,6 +128,12 @@ elseif(GOOGLEMOCK_INCLUDE_DIR AND GOOGLEMOCK_LIBRARY AND GOOGLEMOCK_DEP_GTEST_SO
-    set(GOOGLEMOCK_GTEST_SOURCES "${GOOGLEMOCK_DEP_GTEST_SOURCES}/gtest" CACHE PATH "Path to the gtest sources")
-    message(STATUS "Found libgmock but need to build gtest: ${GOOGLEMOCK_INCLUDE_DIR}, ${GOOGLEMOCK_LIBRARIES} ${GOOGLEMOCK_DEP_GTEST_SOURCES}")
- 
-+elseif(GOOGLEMOCK_INCLUDE_DIR AND GOOGLEMOCK_SOURCES AND GOOGLEMOCK_DEP_GTEST_SOURCES)
-+    set(GOOGLEMOCK_FOUND TRUE)
-+    set(GOOGLEMOCK_GMOCK_SOURCES "${GOOGLEMOCK_SOURCES}/gmock" CACHE PATH "Path to the gmock sources")
-+    set(GOOGLEMOCK_GTEST_SOURCES "${GOOGLEMOCK_DEP_GTEST_SOURCES}/gtest" CACHE PATH "Path to the gtest sources")
-+    message(STATUS "Found gmock and gtest but need to build both: ${GOOGLEMOCK_INCLUDE_DIR}, ${GOOGLEMOCK_SOURCES} ${GOOGLEMOCK_DEP_GTEST_SOURCES}")
-+
- # -- googlemock but no gtest
- else(GOOGLEMOCK_INCLUDE_DIR AND GOOGLEMOCK_LIBRARY AND GOOGLEMOCK_DEP_GTEST_SOURCES)
-    set(GOOGLEMOCK_FOUND FALSE)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 894b9e5..8bdcdb7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -138,6 +138,13 @@ if(GOOGLEMOCK_GTEST_SOURCES)
-     add_subdirectory( ${GOOGLEMOCK_GTEST_SOURCES} gtest )
- endif(GOOGLEMOCK_GTEST_SOURCES)
- 
-+if(GOOGLEMOCK_GMOCK_SOURCES)
-+    add_subdirectory( ${GOOGLEMOCK_GMOCK_SOURCES} gmock )
-+    add_dependencies( gmock gtest )
-+    target_link_libraries( gmock )
-+    set ( GOOGLEMOCK_LIBRARIES gmock )
-+endif(GOOGLEMOCK_GMOCK_SOURCES)
-+
- add_dependencies( testtrackorganizer amarokcore )
- add_dependencies( testtrackorganizer amaroklib )
- add_dependencies( testtrackorganizer gtest )
diff --git a/debian/patches/series b/debian/patches/series
index 8b3b9c0..412be6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff
 debian_find_mysql_fix.diff
 debian_clamz_is_runtime_dependency.diff
-gmock_sources.diff

-- 
Amarok packaging