[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.7.0.0-2-3-gb2b691c

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=b2b691c

The following commit has been merged in the master branch:
commit b2b691c970992d5ed6b3a064a07f7734535d5109
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Dec 7 16:44:09 2013 -0300

    Remove no_rpath.patch.
    
    The logic of the patch is now available in the upstream code.
---
 debian/changelog              |  2 ++
 debian/patches/no_rpath.patch | 31 -------------------------------
 debian/patches/series         |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 492eaad..0d1c22d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ phonon (4:4.7.1-1) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Remove the extra 0 used to avoid the "really" in the versioning.
+  * Remove no_rpath.patch. The logic of the patch is now available in the
+    upstream code.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Dec 2013 15:27:36 -0300
 
diff --git a/debian/patches/no_rpath.patch b/debian/patches/no_rpath.patch
deleted file mode 100644
index df0dbc0..0000000
--- a/debian/patches/no_rpath.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Modestas Vainius <modax at debian.org>, Felix Geyer <debfx-pkg at fobos.de>
-Subject: Do not set install RPATH to /usr/lib by default
-Forwarded: no
-Origin: vendor
-Last-Update: 2012-03-07
-
-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. We also need
-to ensure LIB_INSTALL_DIR is absolute before checking.
-
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -217,10 +217,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)
--list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
--list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
-+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}" _isSystemPlatformLibDir)
-+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_rpath_abs_lib_install_dir}" _isSystemCxxLibDir)
- if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
--   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+   set(CMAKE_INSTALL_RPATH "${_rpath_abs_lib_install_dir}")
- endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index d69ec3f..6b9f883 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 phonon-inc.patch
-no_rpath.patch
 phonon_is_not_forced_in_KDE.diff
 findqt4_optional_x11.diff

-- 
Phonon Multimedia Framework packaging