[SCM] OCE packaging branch, debian, updated. debian/0.12-1

[Denis Barbier]

The following commit has been merged in the debian branch:
commit f4cae507572224af689deeeda8acf4020ec8ad34
Author: Denis Barbier <bouzim at gmail.com>
Date:   Tue Mar 12 00:04:48 2013 +0100

    Upgrade debian/patches/split-export.patch

diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index ba742e9..194ba9c 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -29,8 +29,8 @@ Index: oce/CMakeLists.txt
 ===================================================================
 --- oce.orig/CMakeLists.txt
 +++ oce/CMakeLists.txt
-@@ -934,6 +934,19 @@ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_D
- 				${CMAKE_CURRENT_BINARY_DIR}/Version.rc)
+@@ -1021,6 +1021,19 @@ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_D
+ SET ( ${PROJECT_NAME}_WIN32_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc )
  ENDIF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
  
 +MACRO(DEBIAN_DECLARE_EXPORT_TARGETS packagename modules)
@@ -49,7 +49,7 @@ Index: oce/CMakeLists.txt
  MACRO(PROCESS_MODULE modulename modules_std)
  	set(modules ${modules_std})
  	IF(NOT ${PROJECT_NAME}_DISABLE_X11)
-@@ -999,7 +1012,12 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_D
+@@ -1086,7 +1099,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 )
  
@@ -61,16 +61,16 @@ Index: oce/CMakeLists.txt
 +INSTALL(EXPORT ${PROJECT_NAME}05_VisualizationTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
 +INSTALL(EXPORT ${PROJECT_NAME}06_DrawTargets DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR} COMPONENT Development)
  
- ############
- # PostBuild Step
+ IF(${PROJECT_NAME}_USE_BUNDLE_SOURCE AND ${PROJECT_NAME}_BUNDLE_ROOT_PATH)
+ 	# Add dependencies between OCE and oce-win-bundle
 Index: oce/ProjectConfig.cmake.in
 ===================================================================
 --- oce.orig/ProjectConfig.cmake.in
 +++ oce/ProjectConfig.cmake.in
-@@ -18,7 +18,11 @@ GET_FILENAME_COMPONENT(SELF_DIR "${CMAKE
- 
+@@ -20,7 +20,11 @@ GET_FILENAME_COMPONENT(SELF_DIR "${CMAKE
  SET(@PROJECT_NAME at _INCLUDE_DIRS "${SELF_DIR}/@OCE_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR@")
  SET(@PROJECT_NAME at _LIBRARIES "@OCE_LIBRARIES@")
+ SET(@PROJECT_NAME at _ALL_BUILT_MODULES "@OCE_ALL_BUILT_MODULES@")
 -INCLUDE("${SELF_DIR}/@PROJECT_NAME at -libraries.cmake")
 +FILE(GLOB DEBIAN_TARGET_FILES ${SELF_DIR}/@PROJECT_NAME@*Targets.cmake)
 +LIST(SORT DEBIAN_TARGET_FILES)
@@ -84,7 +84,7 @@ Index: oce/adm/cmake/BuildToolkit.cmake
 ===================================================================
 --- oce.orig/adm/cmake/BuildToolkit.cmake
 +++ oce/adm/cmake/BuildToolkit.cmake
-@@ -254,7 +254,7 @@ ELSE(TOOLKIT_IS_PRIVATE)
+@@ -265,7 +265,7 @@ ELSE(TOOLKIT_IS_PRIVATE)
  ENDIF(TOOLKIT_IS_PRIVATE)
  
  INSTALL(TARGETS ${TOOLKIT}

-- 
OCE packaging