[SCM] QImageBlitz packaging branch, master, updated. debian/0.0.4-4-27-g4e05866

[Modestas Vainius]

The following commit has been merged in the master branch:
commit cba4f4ab3693b59aa31433a4ee5899290a082868
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Jul 28 23:05:29 2010 +0300

    Disable /usr/lib R(UN)PATH
    
    Patch 13_disable_usr_lib_rpath.diff.
---
 debian/changelog                             |    1 +
 debian/patches/13_disable_usr_lib_rpath.diff |   20 ++++++++++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f5a09c..51bcd8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ qimageblitz (1:0.0.6-1) UNRELEASED; urgency=low
   * Remove duplicate Section fields from debian/control.
   * Add Copyright next to (C) in the statement about Debian packaging
     copyright (fixes lintian error).
+  * Disable /usr/lib R(UN)PATH (patch 13_disable_usr_lib_rpath.diff).
 
  -- Modestas Vainius <modax at debian.org>  Wed, 28 Jul 2010 22:53:53 +0300
 
diff --git a/debian/patches/13_disable_usr_lib_rpath.diff b/debian/patches/13_disable_usr_lib_rpath.diff
new file mode 100644
index 0000000..2c382c9
--- /dev/null
+++ b/debian/patches/13_disable_usr_lib_rpath.diff
@@ -0,0 +1,20 @@
+From: Modestas Vainius <modax at debian.org>
+Description: do not set R(UN)PATH to /usr/lib
+Forwarded: no
+Origin: vendor
+Last-Update: 2010-07-28
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,10 @@ endif (WIN32)
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
+ # install directory. Alex
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
++if("${_isSystemLibDir}" STREQUAL "-1")
++    set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++endif("${_isSystemLibDir}" STREQUAL "-1")
+ 
+ if(APPLE)
+    set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index edb0e36..2b59611 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 10_skip_cpu_check.diff
 11_.gnu.note.diff
 12_remove_FindQt4.cmake.diff
+13_disable_usr_lib_rpath.diff

-- 
QImageBlitz packaging