[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.3-1-15-g7df594a

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 4e62292211a78299865664c94c27f1f1ecb2af22
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 20 13:14:19 2011 +0200

    Adapt 02_no_rpath.patch to upstream changes.
---
 debian/changelog                 |    1 +
 debian/patches/02_no_rpath.patch |   40 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ff58d7..4c509cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ phonon (4:4.6.0really4.4.4-0r1) UNRELEASED; urgency=low
     split off to their own source packages upstream. Only phonon-backend-null
     remains here.
   * Remove xine and gstreamer specific packages from Build-Depends.
+  * Adapt 02_no_rpath.patch to upstream changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2010 16:01:39 +0100
 
diff --git a/debian/patches/02_no_rpath.patch b/debian/patches/02_no_rpath.patch
index 5db5695..72ec0ee 100644
--- a/debian/patches/02_no_rpath.patch
+++ b/debian/patches/02_no_rpath.patch
@@ -1,23 +1,23 @@
 From: Modestas Vainius <modax at debian.org>
 Subject: Do not set install RPATH to /usr/lib by default
- /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
- general
-Forwarded: not-needed
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,15 +244,6 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_
-    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
- endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
+Forwarded: no
+Origin: vendor
+Last-Update: 2011-02-20
+
+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.
+
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -233,7 +233,10 @@ 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("${_isSystemLibDir}" STREQUAL "-1")
++   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++endif("${_isSystemLibDir}" STREQUAL "-1")
  
--# 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
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
--set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
--
- if(APPLE)
-    set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
- endif(APPLE)
+ 
+ # Uninstall Target

-- 
Phonon Multimedia Framework packaging