[med-svn] r7258 - in trunk/packages/ginkgocadx/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-07-12 11:30:56 +0000 (Tue, 12 Jul 2011)
New Revision: 7258

Added:
   trunk/packages/ginkgocadx/trunk/debian/patches/
   trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/series
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
Log:
Now ginkgo-cadx builds again


Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2011-07-12 10:12:39 UTC (rev 7257)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2011-07-12 11:30:56 UTC (rev 7258)
@@ -3,8 +3,7 @@
   * New upstream version (most patches applied
     Closes: #630877
   * updated patches to new version:
-     - debian/patches/spelling.patch: Deactivated in series - to high
-       maintenance effort for less use (mail sended to upstream
+     - one remaining non-FHS issue which breaks build
   * debian/{mime,sharedmimeinfo}: Mime info for DICOM images
     Closes: #631205
   * Added manpage + desktop file (thanks to Karsten Hilbert

Added: trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch	2011-07-12 11:30:56 UTC (rev 7258)
@@ -0,0 +1,17 @@
+--- ginkgocadx-2.5.0.1.orig/src/lightvisualizator/CMakeLists.txt
++++ ginkgocadx-2.5.0.1/src/lightvisualizator/CMakeLists.txt
+@@ -31,11 +31,11 @@
+ IF(LINUX AND NOT CUSTOM_PACKAGE)
+ 	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+ 	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+-	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
++	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
+ 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-	LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
++	LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
+ 	IF("${isSystemDir}" STREQUAL "-1")
+-		SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
++		SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
+ 	ENDIF()
+ ENDIF()
+ 

Added: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-07-12 11:30:56 UTC (rev 7258)
@@ -0,0 +1 @@
+remaining_path_issue.patch