[SCM] Soprano RDF Framework packaging branch, experimental, updated. debian/2.9.2+dfsg.1-1-7-ga16efb8

[Maximiliano Curia]

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

The following commit has been merged in the experimental branch:
commit a16efb877b7ad3ef6d1c0cc09e8568b9da624983
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Jun 7 11:25:32 2013 +0200

    New patch, add m-a dirs to the search patch.
---
 debian/changelog                                   |    1 +
 .../patches/add_m-a_dirs_to_the_search_path.diff   |   47 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e7ddef..275405a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 soprano (2.9.2+dfsg.1-3) UNRELEASED; urgency=low
 
   * Rebuild without multi-arch.
+  * New patch, add m-a dirs to the search patch.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 06 Jun 2013 13:10:19 +0200
 
diff --git a/debian/patches/add_m-a_dirs_to_the_search_path.diff b/debian/patches/add_m-a_dirs_to_the_search_path.diff
new file mode 100644
index 0000000..ae88428
--- /dev/null
+++ b/debian/patches/add_m-a_dirs_to_the_search_path.diff
@@ -0,0 +1,47 @@
+commit ae27fd59085fdddc1a167c2ce35f5be52e75ef35
+Author: Maximiliano Curia <maxy at debian.org>
+Date:   Fri Jun 7 12:36:07 2013 +0200
+
+    Add m-a dirs to the search path.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5f96c97..173a864 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -143,6 +143,21 @@ set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Li
+ set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix")
+ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
+ 
++find_program (
++  DPKG_ARCHITECTURE
++  NAMES dpkg-architecture
++  )
++if (DPKG_ARCHITECTURE)
++    execute_process (
++        COMMAND ${DPKG_ARCHITECTURE} -qDEB_HOST_MULTIARCH
++        OUTPUT_VARIABLE DEB_HOST_MULTIARCH
++    )
++    if (DEB_HOST_MULTIARCH)
++        string(REPLACE "
" "" DEB_HOST_MULTIARCH ${DEB_HOST_MULTIARCH})
++        add_definitions(-DDEB_HOST_MULTIARCH="${DEB_HOST_MULTIARCH}")
++    endif (DEB_HOST_MULTIARCH)
++endif (DPKG_ARCHITECTURE)
++
+ 
+ # Set up RPATH handling, so the libs are found if they are installed to a non-standard location.
+ # By default cmake builds the targets with full RPATH to everything in the build directory,
+diff --git a/soprano/sopranodirs.cpp b/soprano/sopranodirs.cpp
+index e6292af..9f302b1 100644
+--- a/soprano/sopranodirs.cpp
++++ b/soprano/sopranodirs.cpp
+@@ -132,6 +132,10 @@ QStringList Soprano::libDirs()
+ #else
+     paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX );
+     paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX );
++#ifdef DEB_HOST_MULTIARCH
++    paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX"/"DEB_HOST_MULTIARCH );
++    paths << QLatin1String( "/usr/local/lib/"SOPRANO_LIB_SUFFIX"/"DEB_HOST_MULTIARCH );
++#endif
+     paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
+ #endif
+     return paths;
diff --git a/debian/patches/series b/debian/patches/series
index baed4bb..c3eecb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 redland_raptor2_support.h
+add_m-a_dirs_to_the_search_path.diff

-- 
Soprano RDF Framework packaging