[SCM] Soprano RDF Framework packaging branch, master, updated. debian/2.9.2+dfsg.1-3-3-ga0e17ac

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/soprano.git;a=commitdiff;h=a0e17ac

The following commit has been merged in the master branch:
commit a0e17ac9644abd60ef2ee3cdb4461bcd2b223d26
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 6 15:57:44 2013 +0200

    fix compatibility with clucene 2.x (#718369)
    
    backport upstream commit 4bfdfdfdee03080ec9ca21eeb168c2ab9dbba0bb
---
 debian/changelog                                 |    3 +
 debian/patches/series                            |    1 +
 debian/patches/upstream_find-clucene-shared.diff |  104 ++++++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 19c0952..3a3b8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ soprano (2.9.2+dfsg.1-4) UNRELEASED; urgency=low
     would require more work to also not break rdepends:
     - drop patch add_m-a_dirs_to_the_search_path.diff
     - remove Pre-Depends
+  * Backport upstream commit 4bfdfdfdee03080ec9ca21eeb168c2ab9dbba0bb to fix
+    compatibility with clucene 2.x; patch upstream_find-clucene-shared.diff.
+    (Closes: #718369)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Aug 2013 14:31:42 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index baed4bb..1de0db2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 redland_raptor2_support.h
+upstream_find-clucene-shared.diff
diff --git a/debian/patches/upstream_find-clucene-shared.diff b/debian/patches/upstream_find-clucene-shared.diff
new file mode 100644
index 0000000..43ac4d9
--- /dev/null
+++ b/debian/patches/upstream_find-clucene-shared.diff
@@ -0,0 +1,104 @@
+Author: Christophe Giboudeaux <cgiboudeaux at gmx.com>
+Author: Rene Engelhard <rene at debian.org>
+Description: Try to find clucene-shared as well
+ .
+ Fixes a linker error when SOPRANO_DISABLE_CLUCENE_INDEX is FALSE.
+Bug-Debian: http://bugs.debian.org/718369
+Origin: upstream, commit:4bfdfdfdee03080ec9ca21eeb168c2ab9dbba0bb
+
+--- soprano-2.9.2+dfsg.1.orig/cmake/modules/FindCLucene.cmake
++++ soprano-2.9.2+dfsg.1/cmake/modules/FindCLucene.cmake
+@@ -4,7 +4,8 @@
+ #
+ # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
+ # CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
+-# CLUCENE_LIBRARY      = the library to link against CLucene
++# CLUCENE_LIBRARY      = the library to link against CLucene DEPRECATED Use CLUCENE_LIBRARIES
++# CLUCENE_LIBRARIES    = the libraries to link against CLucene
+ # CLUCENE_VERSION      = The CLucene version string
+ # CLucene_FOUND        = set to 1 if clucene is found
+ #
+@@ -36,13 +37,27 @@ SET(TRIAL_INCLUDE_PATHS
+   /sw/include
+   /usr/pkg/include
+   )
++
+ FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+   WIN32_DEBUG_POSTFIX d
+   NAMES clucene clucene-core
+   PATHS ${TRIAL_LIBRARY_PATHS})
+-IF (CLUCENE_LIBRARY)
+-  MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
+-ENDIF (CLUCENE_LIBRARY)
++# On Linux, Soprano needs both clucene-core and clucene-shared
++# CLUCENE_LIBRARIES contains both entries if available
++set(CLUCENE_LIBRARIES ${CLUCENE_LIBRARY})
++
++find_library(CLUCENE_SHARED_LIBRARY
++  NAMES clucene-shared
++  HINTS ${TRIAL_LIBRARY_PATHS}
++)
++
++if(CLUCENE_SHARED_LIBRARY)
++  set(CLUCENE_LIBRARIES ${CLUCENE_LIBRARIES} ${CLUCENE_SHARED_LIBRARY})
++endif()
++
++IF(CLUCENE_LIBRARIES)
++  message(STATUS "Found CLucene: ${CLUCENE_LIBRARIES}")
++ENDIF (CLUCENE_LIBRARIES)
+ FIND_PATH(CLUCENE_INCLUDE_DIR
+   NAMES CLucene.h
+   PATHS ${TRIAL_INCLUDE_PATHS})
+@@ -77,13 +92,13 @@ IF (CLUCENE_LIBRARY_DIR)
+   ENDIF (CLMATCH)
+ ENDIF (CLUCENE_LIBRARY_DIR)
+ 
+-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
++IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+   SET(CLucene_FOUND TRUE)
+-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
++ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+ 
+ IF(CLucene_FOUND)
+   IF(NOT CLucene_FIND_QUIETLY)
+-    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
++    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES}")
+   ENDIF(NOT CLucene_FIND_QUIETLY)
+ ELSE(CLucene_FOUND)
+   IF(CLucene_FIND_REQUIRED)
+@@ -94,5 +109,7 @@ ENDIF(CLucene_FOUND)
+ MARK_AS_ADVANCED(
+   CLUCENE_INCLUDE_DIR 
+   CLUCENE_LIBRARY_DIR 
++  CLUCENE_SHARED_LIBRARY 
+   CLUCENE_LIBRARY 
++  CLUCENE_LIBRARIES 
+   )
+--- soprano-2.9.2+dfsg.1.orig/index/CMakeLists.txt
++++ soprano-2.9.2+dfsg.1/index/CMakeLists.txt
+@@ -46,7 +46,7 @@ target_link_libraries(
+   sopranoindex
+   ${QT_QTCORE_LIBRARY}
+   soprano
+-  ${CLUCENE_LIBRARY}
++  ${CLUCENE_LIBRARIES}
+ )
+ 
+ set_target_properties(
+--- soprano-2.9.2+dfsg.1.orig/test/CMakeLists.txt
++++ soprano-2.9.2+dfsg.1/test/CMakeLists.txt
+@@ -156,12 +156,12 @@ if(BUILD_CLUCENE_INDEX)
+   # TString test
+   qt4_automoc(tstringtest tstringtest.cpp)
+   add_executable(tstringtest tstringtest.cpp stringpool.cpp ../index/tstring.cpp)
+-  target_link_libraries(tstringtest ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${CLUCENE_LIBRARY})
++  target_link_libraries(tstringtest ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${CLUCENE_LIBRARIES})
+   add_test(tstringtest ${EXECUTABLE_OUTPUT_PATH}/tstringtest)
+ 
+   qt4_automoc(cluceneindextest cluceneindextest.cpp)
+   add_executable(cluceneindextest cluceneindextest.cpp stringpool.cpp)
+-  target_link_libraries(cluceneindextest soprano sopranoindex ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${CLUCENE_LIBRARY})
++  target_link_libraries(cluceneindextest soprano sopranoindex ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${CLUCENE_LIBRARIES})
+   add_test(cluceneindextest ${EXECUTABLE_OUTPUT_PATH}/cluceneindextest)
+ 
+   qt4_automoc(indexmodelmultithreadingtest indexmodelmultithreadingtest.cpp)

-- 
Soprano RDF Framework packaging