[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0.0-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1ea83f1c2f86a47522c44e5287d7d8aeadb1a2e6
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Feb 19 18:46:01 2012 +0200

    Adapt no_rpath.patch to upstream changes.
---
 debian/changelog              |    1 +
 debian/patches/no_rpath.patch |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de3e7db..b956ebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ phonon (4:4.6.0.0-1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Adapt findqt4_optional_x11.diff to upstream changes.
+  * Adapt no_rpath.patch to upstream changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Jan 2012 22:51:45 +0100
 
diff --git a/debian/patches/no_rpath.patch b/debian/patches/no_rpath.patch
index 72ec0ee..400e3ee 100644
--- a/debian/patches/no_rpath.patch
+++ b/debian/patches/no_rpath.patch
@@ -2,21 +2,27 @@ From: Modestas Vainius <modax at debian.org>
 Subject: Do not set install RPATH to /usr/lib by default
 Forwarded: no
 Origin: vendor
-Last-Update: 2011-02-20
+Last-Update: 2012-02-19
 
 Use proper code in order to avoid setting INSTALL_RPATH to /usr/lib. It is
-disallowed on Debian systems and is a bad practise in general.
+disallowed on Debian systems and is a bad practise in general. We also need
+to ensure LIB_INSTALL_DIR is absolute before checking.
 
 --- a/cmake/FindPhononInternal.cmake
 +++ b/cmake/FindPhononInternal.cmake
-@@ -233,7 +233,10 @@ endif(APPLE)
+@@ -123,7 +123,15 @@ endif(APPLE)
  # 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 (IS_ABSOLUTE "${LIB_INSTALL_DIR}")
++    set(_rpath_abs_lib_install_dir "${LIB_INSTALL_DIR}")
++else()
++    set(_rpath_abs_lib_install_dir "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
++endif()
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_rpath_abs_lib_install_dir}" _isSystemLibDir)
 +if("${_isSystemLibDir}" STREQUAL "-1")
-+   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++   set(CMAKE_INSTALL_RPATH "${_rpath_abs_lib_install_dir}")
 +endif("${_isSystemLibDir}" STREQUAL "-1")
  
  

-- 
Phonon Multimedia Framework packaging