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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bc502434c611115ee65ef147421670e770ca53b3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Sep 18 17:51:55 2013 +0200

    New patch: add_library_architecture_to_libDirs.patch.
---
 debian/changelog                                   |    1 +
 .../add_library_architecture_to_libDirs.patch      |   30 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e452cdf..8dde160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 soprano (2.9.3+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * New patch: add_library_architecture_to_libDirs.patch.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Sep 2013 17:25:16 +0200
 
diff --git a/debian/patches/add_library_architecture_to_libDirs.patch b/debian/patches/add_library_architecture_to_libDirs.patch
new file mode 100644
index 0000000..a450875
--- /dev/null
+++ b/debian/patches/add_library_architecture_to_libDirs.patch
@@ -0,0 +1,30 @@
+Index: soprano/CMakeLists.txt
+===================================================================
+--- soprano.orig/CMakeLists.txt	2013-09-18 18:29:05.920379046 +0200
++++ soprano/CMakeLists.txt	2013-09-18 18:30:51.012192999 +0200
+@@ -136,6 +136,10 @@
+ endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
+ set(HAVE_DBUS BUILD_DBUS_SUPPORT)
+ 
++if(CMAKE_LIBRARY_ARCHITECTURE)
++    add_definitions(-DLIBRARY_ARCHITECTURE="${CMAKE_LIBRARY_ARCHITECTURE}")
++endif(CMAKE_LIBRARY_ARCHITECTURE)
++
+ ##################  setup install directories  ################################
+ set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+ set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
+Index: soprano/soprano/sopranodirs.cpp
+===================================================================
+--- soprano.orig/soprano/sopranodirs.cpp	2013-09-18 18:29:05.920379046 +0200
++++ soprano/soprano/sopranodirs.cpp	2013-09-18 18:29:05.916379206 +0200
+@@ -132,6 +132,10 @@
+ #else
+     paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX );
+     paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX );
++#ifdef LIBRARY_ARCHITECTURE
++    paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX"/"LIBRARY_ARCHITECTURE );
++    paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX"/"LIBRARY_ARCHITECTURE );
++#endif
+     paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
+ #endif
+     return paths;
diff --git a/debian/patches/series b/debian/patches/series
index 1de0db2..aaed001 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 redland_raptor2_support.h
 upstream_find-clucene-shared.diff
+add_library_architecture_to_libDirs.patch

-- 
Soprano RDF Framework packaging