[SCM] Phonon VLC backend packaging branch, master, updated. debian/0.3.1-3-11-gf8414e6

[Modestas Vainius]

The following commit has been merged in the master branch:
commit f74b501e4c8466d483f77a1f5655ddc6bc06fc67
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Mar 5 03:31:13 2011 +0200

    Drop disable_usr_lib_install_rpath.diff patch, no longer needed.
---
 debian/changelog                                  |    2 ++
 debian/patches/disable_usr_lib_install_rpath.diff |   20 --------------------
 debian/patches/series                             |    1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index baf834d..c0d1caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 phonon-backend-vlc (0.3.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop debian/patches/disable_usr_lib_install_rpath.diff patch, no longer
+    needed.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 05 Mar 2011 03:25:55 +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 60fd8d4..0000000
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-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
index 02447dd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-disable_usr_lib_install_rpath.diff

-- 
Phonon VLC backend packaging