[SCM] Soprano RDF Framework packaging branch, experimental, updated. debian/2.9.0+dfsg1-1-2-g0f3e173

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 0f3e17344dd3a9c5017cfa32de91f4a1743df9c9
Author: Pino Toscano <pino at debian.org>
Date:   Sun May 5 13:58:45 2013 +0200

    drop disable_usr_lib_install_rpath.diff
    
    unused since 2.9.0+dfsg1-1
---
 debian/changelog                                  |    2 +
 debian/patches/disable_usr_lib_install_rpath.diff |   29 ---------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aabf9f8..3801696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 soprano (2.9.0+dfsg1-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Drop unused (since 2.9.0+dfsg1-1) patch disable_usr_lib_install_rpath.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 May 2013 13:56:50 +0200
 
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
deleted file mode 100644
index 2049825..0000000
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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