[SCM] Phonon VLC backend packaging branch, master, updated. debian/0.2.0-1-8-g8837f37

[Modestas Vainius]

The following commit has been merged in the master branch:
commit e7ab56732a11189f9c27c625e963c3dfc3639f2e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Dec 8 01:16:07 2010 +0200

    Disable /usr/lib RPATH.
    
    Patch: disable_usr_lib_install_rpath.diff
---
 debian/changelog                                  |    1 +
 debian/patches/disable_usr_lib_install_rpath.diff |   20 ++++++++++++++++++++
 debian/patches/series                             |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f8a027..4013c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ phonon-backend-vlc (0.3.1-0r1) UNRELEASED; urgency=low
   * Update Vcs-* fields in debian/control.
   * Require libvlc-dev 1.1.1.
   * Require libphonon-dev 4.4.3 to enable all backend features.
+  * Add disable_usr_lib_install_rpath.diff patch to disable /usr/lib RPATH.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 08 Dec 2010 00:53:42 +0200
 
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..60fd8d4
--- /dev/null
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -0,0 +1,20 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Avoid adding /usr/lib and other system directories to R(UN)PATH
+Origin: vender
+Forwarded: no
+Last-Update: 2010-12-08
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -264,7 +264,10 @@ endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE
+ # 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
new file mode 100644
index 0000000..02447dd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_usr_lib_install_rpath.diff

-- 
Phonon VLC backend packaging