[med-svn] r7278 - in trunk/packages/ginkgocadx/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Thu Jul 14 14:57:27 UTC 2011
Author: tille
Date: 2011-07-14 14:57:27 +0000 (Thu, 14 Jul 2011)
New Revision: 7278
Removed:
trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch
Modified:
trunk/packages/ginkgocadx/trunk/debian/changelog
trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch
trunk/packages/ginkgocadx/trunk/debian/patches/series
Log:
Finally we can build Ginkgo CADx again ...
Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog 2011-07-14 07:31:41 UTC (rev 7277)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog 2011-07-14 14:57:27 UTC (rev 7278)
@@ -1,11 +1,8 @@
-ginkgocadx (2.5.0.1-1) UNRELEASED; urgency=low
+ginkgocadx (2.5.1.0-1) unstable; urgency=low
- * New upstream version (most patches applied
+ * New upstream version (all patches applied)
Closes: #630877
- * updated patches to new version:
- - remaining_path_issue.patch: one remaining non-FHS issue which
- breaks build
- - drop_rpath.patch: drop explicite rpath defitions
+ * debian/patches/drop_rpath.patch: Fix remaining rpath issue
* debian/{mime,sharedmimeinfo}: Mime info for DICOM images
Closes: #631205
* Add upstream manpage + desktop file
@@ -22,7 +19,7 @@
once rpath is correctly fixed - so the warning should not
be hidden here.
- -- Andreas Tille <tille at debian.org> Tue, 12 Jul 2011 08:19:11 +0200
+ -- Andreas Tille <tille at debian.org> Thu, 14 Jul 2011 16:17:51 +0200
ginkgocadx (2.4.1.1-2) unstable; urgency=low
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch 2011-07-14 07:31:41 UTC (rev 7277)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch 2011-07-14 14:57:27 UTC (rev 7278)
@@ -1,5 +1,5 @@
---- ginkgocadx-2.5.0.1.orig/src/lightvisualizator/CMakeLists.txt
-+++ ginkgocadx-2.5.0.1/src/lightvisualizator/CMakeLists.txt
+--- ginkgocadx-2.5.1.0.orig/src/lightvisualizator/CMakeLists.txt
++++ ginkgocadx-2.5.1.0/src/lightvisualizator/CMakeLists.txt
@@ -81,7 +81,7 @@
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
@@ -9,48 +9,3 @@
INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
################ LIBS ################
---- ginkgocadx-2.5.0.1.orig/src/fooextension/CMakeLists.txt
-+++ ginkgocadx-2.5.0.1/src/fooextension/CMakeLists.txt
-@@ -86,7 +86,7 @@
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
- VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
- LINK_INTERFACE_LIBRARIES ""
-- INSTALL_RPATH_USE_LINK_PATH TRUE )
-+ INSTALL_RPATH_USE_LINK_PATH FALSE )
- INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
-
- ################ LIBS ################
---- ginkgocadx-2.5.0.1.orig/src/cadxcore/CMakeLists.txt
-+++ ginkgocadx-2.5.0.1/src/cadxcore/CMakeLists.txt
-@@ -202,7 +202,7 @@
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
- VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
- LINK_INTERFACE_LIBRARIES ""
-- INSTALL_RPATH_USE_LINK_PATH TRUE )
-+ INSTALL_RPATH_USE_LINK_PATH FALSE )
- INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/es)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/ja)
---- ginkgocadx-2.5.0.1.orig/src/ginkgocadx/CMakeLists.txt
-+++ ginkgocadx-2.5.0.1/src/ginkgocadx/CMakeLists.txt
-@@ -87,8 +87,7 @@
- IF(LINUX)
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
- LINK_INTERFACE_LIBRARIES ""
-- CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
--
-+ )
- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
- ENDIF()
-
---- ginkgocadx-2.5.0.1.orig/src/visualizator/CMakeLists.txt
-+++ ginkgocadx-2.5.0.1/src/visualizator/CMakeLists.txt
-@@ -105,7 +105,7 @@
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
- VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
- LINK_INTERFACE_LIBRARIES ""
-- INSTALL_RPATH_USE_LINK_PATH TRUE )
-+ INSTALL_RPATH_USE_LINK_PATH FALSE )
- INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/lang/es)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/visualizator.mo DESTINATION share/ginkgocadx/lang/ja)
Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch 2011-07-14 07:31:41 UTC (rev 7277)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/remaining_path_issue.patch 2011-07-14 14:57:27 UTC (rev 7278)
@@ -1,17 +0,0 @@
---- 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()
-
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series 2011-07-14 07:31:41 UTC (rev 7277)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2011-07-14 14:57:27 UTC (rev 7278)
@@ -1,2 +1 @@
-remaining_path_issue.patch
drop_rpath.patch
More information about the debian-med-commit
mailing list