rev 18290 - in trunk/packages/kdeedu/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-06-07 16:26:04 +0000 (Mon, 07 Jun 2010)
New Revision: 18290

Added:
   trunk/packages/kdeedu/debian/patches/02_no_useless_rpath.diff
Modified:
   trunk/packages/kdeedu/debian/changelog
   trunk/packages/kdeedu/debian/patches/series
Log:
Do not ship marble plugins with useless R(UN)PATH=/usr (Closes: #582139).

Modified: trunk/packages/kdeedu/debian/changelog
===================================================================
--- trunk/packages/kdeedu/debian/changelog	2010-06-07 09:13:52 UTC (rev 18289)
+++ trunk/packages/kdeedu/debian/changelog	2010-06-07 16:26:04 UTC (rev 18290)
@@ -1,3 +1,9 @@
+kdeedu (4:4.4.4-2) UNRELEASED; urgency=low
+
+  * Do not ship marble plugins with useless R(UN)PATH=/usr (Closes: #582139).
+
+ -- Modestas Vainius <modax at debian.org>  Mon, 07 Jun 2010 19:24:02 +0300
+
 kdeedu (4:4.4.4-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdeedu/debian/patches/02_no_useless_rpath.diff
===================================================================
--- trunk/packages/kdeedu/debian/patches/02_no_useless_rpath.diff	                        (rev 0)
+++ trunk/packages/kdeedu/debian/patches/02_no_useless_rpath.diff	2010-06-07 16:26:04 UTC (rev 18290)
@@ -0,0 +1,26 @@
+Author: Modestas Vainius <modax at debian.org>
+Description: do not ship marble plugins with useless R(UN)PATH=/usr
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582139
+Forwarded: no
+Last-Update: 2010-06-07
+
+--- a/marble/MarbleMacros.cmake
++++ b/marble/MarbleMacros.cmake
+@@ -36,7 +36,7 @@ set_target_properties( ${_target_name} P
+                        INSTALL_RPATH_USE_LINK_PATH TRUE  
+                        SKIP_BUILD_RPATH TRUE 
+                        BUILD_WITH_INSTALL_RPATH TRUE 
+-                       INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_SUFFIX} )
++                     )
+ 
+ endmacro( marble_add_plugin _target_name )
+ 
+@@ -81,7 +81,7 @@ set_target_properties( ${_target_name} P
+                        INSTALL_RPATH_USE_LINK_PATH TRUE  
+                        SKIP_BUILD_RPATH TRUE 
+                        BUILD_WITH_INSTALL_RPATH TRUE 
+-                       INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_SUFFIX} )
++                     )
+ 
+ endmacro( marble_add_designer_plugin _target_name )
+ 

Modified: trunk/packages/kdeedu/debian/patches/series
===================================================================
--- trunk/packages/kdeedu/debian/patches/series	2010-06-07 09:13:52 UTC (rev 18289)
+++ trunk/packages/kdeedu/debian/patches/series	2010-06-07 16:26:04 UTC (rev 18290)
@@ -1 +1,2 @@
 step_needs_-lcln.diff
+02_no_useless_rpath.diff