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

[Daniele E. Domenichelli]

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

The following commit has been merged in the experimental branch:
commit 92f7e0b30063c03602aeea7abfcc9d27b0212de1
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Nov 13 09:30:35 2012 +0100

    Restore debian/patches/disable_usr_lib_install_rpath.diff and update it
---
 debian/changelog                                  |    4 ++-
 debian/patches/disable_usr_lib_install_rpath.diff |   29 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50cc6b0..6cd86a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ soprano (2.8.0+dfsg.1-0r1) UNRELEASED; urgency=low
   * New upstream release. 
 
   [ José Manuel Santamaría Lema ]
-  * Delete disable_usr_lib_install_rpath.diff, applied upstream.
   * Update symbols files.
   * Bump debhelper compatibility level to 9.
 
+  [ Daniele E. Domenichelli ]
+  * Update disable_usr_lib_install_rpath.diff
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Jul 2012 18:27:33 +0200
 
 soprano (2.7.6+dfsg.1-1) unstable; urgency=low
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
new file mode 100644
index 0000000..2049825
--- /dev/null
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -0,0 +1,29 @@
+Description: Do not set install RPATH to /usr/lib by default
+             /usr/lib RPATH is disallowed on Debian systems
+             and is a bad practice in general
+Author: Modestas Vainius <modax at debian.org>
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,20 +136,6 @@ set(INCLUDE_INSTALL_DIR      "${CMAKE_IN
+ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
+ 
+ 
+-# 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,
+-# but then removes the RPATH when installing.
+-# These two options below make it set the RPATH of the installed targets to all
+-# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+-# install directory. Alex
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemPlatformLibDir)
+-list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCLibDir)
+-list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCxxLibDir)
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+-set(CMAKE_INSTALL_RPATH                ${LIB_DESTINATION} )
+-endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+-
+ if(APPLE)
+    set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
+ endif(APPLE)

-- 
Soprano RDF Framework packaging