rev 17469 - trunk/packages/kdebase-runtime/debian/patches

[Modestas Vainius]

Author: modax
Date: 2010-03-20 14:05:45 +0000 (Sat, 20 Mar 2010)
New Revision: 17469

Modified:
   trunk/packages/kdebase-runtime/debian/patches/03_disable_usr_lib_install_rpath.diff
Log:
Adapt 03_disable_usr_lib_install_rpath.diff to upstream changes, add DEP-3 header.

Modified: trunk/packages/kdebase-runtime/debian/patches/03_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/03_disable_usr_lib_install_rpath.diff	2010-03-20 12:54:56 UTC (rev 17468)
+++ trunk/packages/kdebase-runtime/debian/patches/03_disable_usr_lib_install_rpath.diff	2010-03-20 14:05:45 UTC (rev 17469)
@@ -1,10 +1,19 @@
+Author: George Kiagiadakis <gkiagiad at csd.uoc.gr>
+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/phonon/platform_kde/CMakeLists.txt
 +++ b/phonon/platform_kde/CMakeLists.txt
-@@ -16,7 +16,6 @@
-                             INSTALL_RPATH_USE_LINK_PATH TRUE
-                             SKIP_BUILD_RPATH TRUE
-                             BUILD_WITH_INSTALL_RPATH TRUE
--                            INSTALL_RPATH ${LIB_INSTALL_DIR}
-                         )
+@@ -19,10 +19,8 @@
+ 
+ if(NOT WIN32)
+    set_target_properties(kde PROPERTIES
+-                             INSTALL_RPATH_USE_LINK_PATH TRUE
+                              SKIP_BUILD_RPATH TRUE
+                              BUILD_WITH_INSTALL_RPATH TRUE
+-                             INSTALL_RPATH ${LIB_INSTALL_DIR}
+    )
  endif(NOT WIN32)
- install(TARGETS kde DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_platform)
+