r35384 - in /packages/openigtlink/trunk/debian/patches: 00list 10_all_changes.dpatch 27_soname_pthread.dpatch 74_path.dpatch 88_install.dpatch
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Wed Dec 24 06:46:32 UTC 2008
Author: domibel-guest
Date: Wed Dec 24 06:46:31 2008
New Revision: 35384
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35384
Log:
changed installation path
Added:
packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch (with props)
Removed:
packages/openigtlink/trunk/debian/patches/27_soname_pthread.dpatch
packages/openigtlink/trunk/debian/patches/74_path.dpatch
packages/openigtlink/trunk/debian/patches/88_install.dpatch
Modified:
packages/openigtlink/trunk/debian/patches/00list
Modified: packages/openigtlink/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/00list?rev=35384&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/patches/00list (original)
+++ packages/openigtlink/trunk/debian/patches/00list Wed Dec 24 06:46:31 2008
@@ -1,3 +1,1 @@
-74_path.dpatch
-27_soname_pthread.dpatch
-88_install.dpatch
+10_all_changes.dpatch
Added: packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch?rev=35384&op=file
==============================================================================
--- packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch (added)
+++ packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch Wed Dec 24 06:46:31 2008
@@ -1,0 +1,148 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_all_changes.dpatch by <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openigtlink-1.0.0~svn3461~/CMakeLists.txt openigtlink-1.0.0~svn3461/CMakeLists.txt
+--- openigtlink-1.0.0~svn3461~/CMakeLists.txt 2008-12-24 01:36:19.000000000 -0500
++++ openigtlink-1.0.0~svn3461/CMakeLists.txt 2008-12-24 01:41:35.000000000 -0500
+@@ -9,6 +9,12 @@
+ ENABLE_TESTING()
+ INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+
++# version
++SET(OpenIGTLink_VERSION_MAJOR "1")
++SET(OpenIGTLink_VERSION_MINOR "0")
++SET(OpenIGTLink_VERSION_PATCH "0")
++
++
+ #-----------------------------------------------------------------------------
+ # OpenIGTLink build configuration options.
+
+@@ -51,24 +57,34 @@
+ # OpenIGTLink_INSTALL_NO_DOCUMENTATION - do not install documentation files
+
+ IF(NOT OpenIGTLink_INSTALL_BIN_DIR)
+- SET(OpenIGTLink_INSTALL_BIN_DIR "bin")
++ SET(OpenIGTLink_INSTALL_BIN_DIR
++ ${CMAKE_INSTALL_PREFIX}/bin
++ )
+ ENDIF(NOT OpenIGTLink_INSTALL_BIN_DIR)
+
+ IF(NOT OpenIGTLink_INSTALL_LIB_DIR)
+- SET(OpenIGTLink_INSTALL_LIB_DIR "lib/igtl")
++ SET(OpenIGTLink_INSTALL_LIB_DIR
++ ${CMAKE_INSTALL_PREFIX}/lib
++ )
+ ENDIF(NOT OpenIGTLink_INSTALL_LIB_DIR)
+
+ IF(NOT OpenIGTLink_INSTALL_DATA_DIR)
+- SET(OpenIGTLink_INSTALL_DATA_DIR "share/igtl")
++ SET(OpenIGTLink_INSTALL_DATA_DIR
++ ${CMAKE_INSTALL_PREFIX}/share/igtl
++ )
+ ENDIF(NOT OpenIGTLink_INSTALL_DATA_DIR)
+
+ IF(NOT OpenIGTLink_INSTALL_INCLUDE_DIR)
+- SET(OpenIGTLink_INSTALL_INCLUDE_DIR "include/igtl")
++ SET(OpenIGTLink_INSTALL_INCLUDE_DIR
++ ${CMAKE_INSTALL_PREFIX}/include/igtl
++ )
+ ENDIF(NOT OpenIGTLink_INSTALL_INCLUDE_DIR)
+
+ IF(NOT OpenIGTLink_INSTALL_PACKAGE_DIR)
+- SET(OpenIGTLink_INSTALL_PACKAGE_DIR ${OpenIGTLink_INSTALL_LIB_DIR}
+- CACHE INTERNAL "")
++ SET(OpenIGTLink_INSTALL_PACKAGE_DIR
++ ${CMAKE_INSTALL_PREFIX}/lib/igtl
++ CACHE INTERNAL ""
++ )
+ ENDIF(NOT OpenIGTLink_INSTALL_PACKAGE_DIR)
+
+ IF(NOT OpenIGTLink_INSTALL_NO_DOCUMENTATION)
+@@ -190,6 +206,7 @@
+ INSTALL(FILES
+ ${OpenIGTLink_BINARY_DIR}/OpenIGTLinkBuildSettings.cmake
+ # ${OpenIGTLink_BINARY_DIR}/OpenIGTLinkLibraryDepends.cmake
++ ${OpenIGTLink_BINARY_DIR}/OpenIGTLinkConfig.cmake
+ ${OpenIGTLink_BINARY_DIR}/UseOpenIGTLink.cmake
+ DESTINATION ${OpenIGTLink_INSTALL_PACKAGE_DIR}
+ COMPONENT Development
+diff -urNad openigtlink-1.0.0~svn3461~/OpenIGTLinkConfig.cmake.in openigtlink-1.0.0~svn3461/OpenIGTLinkConfig.cmake.in
+--- openigtlink-1.0.0~svn3461~/OpenIGTLinkConfig.cmake.in 2008-12-24 01:36:19.000000000 -0500
++++ openigtlink-1.0.0~svn3461/OpenIGTLinkConfig.cmake.in 2008-12-24 01:41:02.000000000 -0500
+@@ -7,10 +7,10 @@
+ @OpenIGTLink_CONFIG_CODE@
+
+ # The OpenIGTLink include file directories.
+-SET(OpenIGTLink_INCLUDE_DIRS "@OpenIGTLink_INCLUDE_DIRS_CONFIG@")
++SET(OpenIGTLink_INCLUDE_DIRS "@OpenIGTLink_INSTALL_INCLUDE_DIR@" )
+
+ # The OpenIGTLink library directories.
+-SET(OpenIGTLink_LIBRARY_DIRS "@OpenIGTLink_LIBRARY_DIRS_CONFIG@")
++SET(OpenIGTLink_LIBRARY_DIRS "@OpenIGTLink_INSTALL_LIB_DIR@")
+
+ # The C and C++ flags added by OpenIGTLink to the cmake-configured flags.
+ SET(OpenIGTLink_REQUIRED_C_FLAGS "@OpenIGTLink_REQUIRED_C_FLAGS@")
+@@ -23,10 +23,10 @@
+ SET(OpenIGTLink_VERSION_PATCH "@OpenIGTLink_VERSION_PATCH@")
+
+ # The location of the UseOpenIGTLink.cmake file.
+-SET(OpenIGTLink_USE_FILE "@OpenIGTLink_USE_FILE@")
++SET(OpenIGTLink_USE_FILE "@OpenIGTLink_INSTALL_PACKAGE_DIR@/UseOpenIGTLink.cmake")
+
+ # The build settings file.
+-SET(OpenIGTLink_BUILD_SETTINGS_FILE "@OpenIGTLink_BUILD_SETTINGS_FILE@")
++SET(OpenIGTLink_BUILD_SETTINGS_FILE "@OpenIGTLink_INSTALL_PACKAGE_DIR@/OpenIGTLinkBuildSettings.cmake")
+
+ # The library dependencies file.
+ SET(OpenIGTLink_LIBRARY_DEPENDS_FILE "@OpenIGTLink_LIBRARY_DEPENDS_FILE@")
+diff -urNad openigtlink-1.0.0~svn3461~/Source/CMakeLists.txt openigtlink-1.0.0~svn3461/Source/CMakeLists.txt
+--- openigtlink-1.0.0~svn3461~/Source/CMakeLists.txt 2008-12-24 01:36:19.000000000 -0500
++++ openigtlink-1.0.0~svn3461/Source/CMakeLists.txt 2008-12-24 01:41:02.000000000 -0500
+@@ -61,6 +61,11 @@
+ ${OpenIGTLink_SOURCES}
+ )
+
++SET_TARGET_PROPERTIES(OpenIGTLink PROPERTIES
++ VERSION ${OpenIGTLink_VERSION_MAJOR}.${OpenIGTLink_VERSION_MINOR}.${OpenIGTLink_VERSION_PATCH}
++ SOVERSION ${OpenIGTLink_VERSION_MAJOR}
++)
++
+ TARGET_LINK_LIBRARIES(OpenIGTLink
+ ${LINK_LIBS}
+ )
+diff -urNad openigtlink-1.0.0~svn3461~/Source/igtlutil/CMakeLists.txt openigtlink-1.0.0~svn3461/Source/igtlutil/CMakeLists.txt
+--- openigtlink-1.0.0~svn3461~/Source/igtlutil/CMakeLists.txt 2008-12-24 01:36:19.000000000 -0500
++++ openigtlink-1.0.0~svn3461/Source/igtlutil/CMakeLists.txt 2008-12-24 01:41:02.000000000 -0500
+@@ -31,6 +31,12 @@
+ ${igtlutil_SOURCES}
+ )
+
++SET_TARGET_PROPERTIES(igtlutil PROPERTIES
++ VERSION ${OpenIGTLink_VERSION_MAJOR}.${OpenIGTLink_VERSION_MINOR}.${OpenIGTLink_VERSION_PATCH}
++ SOVERSION ${OpenIGTLink_VERSION_MAJOR}
++)
++
++
+ #TARGET_LINK_LIBRARIES(igtlutil
+ # ${LIBS}
+ # )
+diff -urNad openigtlink-1.0.0~svn3461~/debian/patched/27_soname_pthread.dpatch openigtlink-1.0.0~svn3461/debian/patched/27_soname_pthread.dpatch
+--- openigtlink-1.0.0~svn3461~/debian/patched/27_soname_pthread.dpatch 1969-12-31 19:00:00.000000000 -0500
++++ openigtlink-1.0.0~svn3461/debian/patched/27_soname_pthread.dpatch 2008-12-24 01:41:02.000000000 -0500
+@@ -0,0 +1,2 @@
++patching file Source/CMakeLists.txt
++patching file Source/igtlutil/CMakeLists.txt
+diff -urNad openigtlink-1.0.0~svn3461~/debian/patched/74_path.dpatch openigtlink-1.0.0~svn3461/debian/patched/74_path.dpatch
+--- openigtlink-1.0.0~svn3461~/debian/patched/74_path.dpatch 1969-12-31 19:00:00.000000000 -0500
++++ openigtlink-1.0.0~svn3461/debian/patched/74_path.dpatch 2008-12-24 01:41:02.000000000 -0500
+@@ -0,0 +1 @@
++patching file CMakeLists.txt
+diff -urNad openigtlink-1.0.0~svn3461~/debian/patched/88_install.dpatch openigtlink-1.0.0~svn3461/debian/patched/88_install.dpatch
+--- openigtlink-1.0.0~svn3461~/debian/patched/88_install.dpatch 1969-12-31 19:00:00.000000000 -0500
++++ openigtlink-1.0.0~svn3461/debian/patched/88_install.dpatch 2008-12-24 01:41:02.000000000 -0500
+@@ -0,0 +1 @@
++patching file OpenIGTLinkConfig.cmake.in
Propchange: packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the debian-science-commits
mailing list