[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=cf92731

The following commit has been merged in the master branch:
commit cf927318cbd4e2182aa87cf8ce74642cd4802ed0
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Oct 26 21:41:58 2013 +0200

    Update patch: add_library_architecture_to_libDirs.patch.
---
 debian/changelog                                         |    6 ++++++
 debian/patches/add_library_architecture_to_libDirs.patch |   12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c5df14..89d151f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soprano (2.9.3+dfsg-2) UNRELEASED; urgency=low
+
+  * Update patch: add_library_architecture_to_libDirs.patch.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sat, 26 Oct 2013 21:40:18 +0200
+
 soprano (2.9.3+dfsg-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/add_library_architecture_to_libDirs.patch b/debian/patches/add_library_architecture_to_libDirs.patch
index a450875..5f5bc9d 100644
--- a/debian/patches/add_library_architecture_to_libDirs.patch
+++ b/debian/patches/add_library_architecture_to_libDirs.patch
@@ -1,7 +1,7 @@
 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
+--- soprano.orig/CMakeLists.txt	2013-10-26 21:38:41.206651307 +0200
++++ soprano/CMakeLists.txt	2013-10-26 21:38:41.202651468 +0200
 @@ -136,6 +136,10 @@
  endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
  set(HAVE_DBUS BUILD_DBUS_SUPPORT)
@@ -15,15 +15,15 @@ Index: soprano/CMakeLists.txt
  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
+--- soprano.orig/soprano/sopranodirs.cpp	2013-10-26 21:38:41.206651307 +0200
++++ soprano/soprano/sopranodirs.cpp	2013-10-26 21:39:33.700543565 +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 );
++    paths << QLatin1String( "/usr/lib/"LIBRARY_ARCHITECTURE );
++    paths << QLatin1String( "/usr/local/lib/"LIBRARY_ARCHITECTURE );
 +#endif
      paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
  #endif

-- 
Soprano RDF Framework packaging