rev 16755 - in trunk/packages/kdelibs/debian: . patches

[Kai Wasserbäch]

Author: curan-guest
Date: 2010-01-31 22:30:56 +0000 (Sun, 31 Jan 2010)
New Revision: 16755

Added:
   trunk/packages/kdelibs/debian/patches/00_search_for_soprano_module.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/patches/series
Log:
[kde4libs] (trunk) Fixed Soprano B-D and ?\226?\128?\158SopranoAddOntology.cmake?\226?\128?\156

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-01-31 21:08:08 UTC (rev 16754)
+++ trunk/packages/kdelibs/debian/changelog	2010-01-31 22:30:56 UTC (rev 16755)
@@ -20,14 +20,18 @@
       + 20_use_dejavu_as_default_font.diff
       + 23_solid_no_double_build.diff
       + 25_ld_exclude_libs_qtuitools.diff
+    - Added patches:
+      + 00_search_for_soprano_module.diff: Debian's „SopranoAddOntology.cmake“
+        is located somewhere else.
   * debian/control:
     - Added Build-Depends on libattica-dev, shared-desktop-ontologies and
       libpolkit-qt-1-dev.
     - Bumped Build-Depends for Qt to 4.6.0.
     - Bumped Build-Depends for Phonon to 4.4.0.
+    - Bumped Build-Depends for libsoprano-dev to >= 2.3.70
     - Bumped Standards-Version to 3.8.4, no further changes needed.
 
- -- Kai Wasserbäch <debian at carbon-project.org>  Sun, 31 Jan 2010 22:06:40 +0100
+ -- Kai Wasserbäch <debian at carbon-project.org>  Sun, 31 Jan 2010 23:28:20 +0100
 
 kde4libs (4:4.3.4-1) unstable; urgency=low
 

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-01-31 21:08:08 UTC (rev 16754)
+++ trunk/packages/kdelibs/debian/control	2010-01-31 22:30:56 UTC (rev 16755)
@@ -9,7 +9,7 @@
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libpng-dev, libssl-dev, libsm-dev, flex, bison,
- libsoprano-dev (>= 2.3.0), libstreamanalyzer-dev (>= 0.6.3),
+ libsoprano-dev (>= 2.3.70), libstreamanalyzer-dev (>= 0.6.3),
  libxml2-dev, libxml2-utils,  libxslt1-dev, libxtst-dev, libgif-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
  libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,

Added: trunk/packages/kdelibs/debian/patches/00_search_for_soprano_module.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/00_search_for_soprano_module.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/00_search_for_soprano_module.diff	2010-01-31 22:30:56 UTC (rev 16755)
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,7 +233,7 @@ check_library_exists(socket connect "" H
+ # so this must be fixed. Alex
+ if(Soprano_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
+   set(HAVE_NEPOMUK true)
+-  include(SopranoAddOntology)
++  include("/usr/share/kde4/apps/cmake/modules/SopranoAddOntology.cmake")
+   add_subdirectory(nepomuk)
+ endif(Soprano_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
+ 
+--- a/nepomuk/CMakeLists.txt
++++ b/nepomuk/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(nepomuk)
+ 
+-include(SopranoAddOntology)
++include("/usr/share/kde4/apps/cmake/modules/SopranoAddOntology.cmake")
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ 
+--- a/nepomuk/core/test/CMakeLists.txt
++++ b/nepomuk/core/test/CMakeLists.txt
+@@ -8,7 +8,7 @@ include_directories( 
+   ${SOPRANO_INCLUDE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+   )
+-include (SopranoAddOntology)
++include ("/usr/share/kde4/apps/cmake/modules/SopranoAddOntology.cmake")
+ 
+ # The basis of all the tests handling statements
+ kde4_add_library(nepomuk_testbase STATIC testbase.cpp)

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-01-31 21:08:08 UTC (rev 16754)
+++ trunk/packages/kdelibs/debian/patches/series	2010-01-31 22:30:56 UTC (rev 16755)
@@ -1,3 +1,4 @@
+00_search_for_soprano_module.diff
 08_add_debian_build_type.diff
 11_default_kde4_xdg_menu_prefix.diff
 13_qt4_designer_plugins_path.diff