[SCM] OCE packaging branch, debian, updated. debian/0.11-1
Denis Barbier
bouzim at gmail.com
Thu Dec 13 19:16:58 UTC 2012
The following commit has been merged in the debian branch:
commit 405da5505622f560f7ef4f06a04869d4cb558000
Author: Denis Barbier <bouzim at gmail.com>
Date: Wed Dec 12 20:16:15 2012 +0100
Refresh debian/patches/split-export.patch
diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index 8843288..ba742e9 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -29,7 +29,7 @@ Index: oce/CMakeLists.txt
===================================================================
--- oce.orig/CMakeLists.txt
+++ oce/CMakeLists.txt
-@@ -924,6 +924,19 @@ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_D
+@@ -934,6 +934,19 @@ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_D
${CMAKE_CURRENT_BINARY_DIR}/Version.rc)
ENDIF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
@@ -49,7 +49,7 @@ Index: oce/CMakeLists.txt
MACRO(PROCESS_MODULE modulename modules_std)
set(modules ${modules_std})
IF(NOT ${PROJECT_NAME}_DISABLE_X11)
-@@ -989,7 +1002,12 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_D
+@@ -999,7 +1012,12 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_D
INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development )
@@ -84,7 +84,7 @@ Index: oce/adm/cmake/BuildToolkit.cmake
===================================================================
--- oce.orig/adm/cmake/BuildToolkit.cmake
+++ oce/adm/cmake/BuildToolkit.cmake
-@@ -166,7 +166,7 @@ ELSE(TOOLKIT_IS_PRIVATE)
+@@ -254,7 +254,7 @@ ELSE(TOOLKIT_IS_PRIVATE)
ENDIF(TOOLKIT_IS_PRIVATE)
INSTALL(TARGETS ${TOOLKIT}
--
OCE packaging
More information about the debian-science-commits
mailing list