[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.1_rc1-3-4-g07c53b0

[Denis Barbier]

The following commit has been merged in the debian branch:
commit 6867ca1ee3b28c6c0dbc8be1ba21743429b12616
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Dec 13 20:54:19 2012 +0100

    Install CMake files into /usr/lib/openturns

diff --git a/debian/libopenturns-dev.install b/debian/libopenturns-dev.install
index 6eaaf03..86afddc 100644
--- a/debian/libopenturns-dev.install
+++ b/debian/libopenturns-dev.install
@@ -1,5 +1,6 @@
 usr/bin/*
 usr/lib/libOT*.so
+usr/lib/openturns/*.cmake
 usr/share/openturns/m4/*
 usr/include/openturns/*.h*
 usr/share/openturns/WrapperTemplates
diff --git a/debian/patches/install_cmake_files.patch b/debian/patches/install_cmake_files.patch
new file mode 100644
index 0000000..eec9a5e
--- /dev/null
+++ b/debian/patches/install_cmake_files.patch
@@ -0,0 +1,46 @@
+Index: openturns/CMakeLists.txt
+===================================================================
+--- openturns.orig/CMakeLists.txt
++++ openturns/CMakeLists.txt
+@@ -336,6 +336,10 @@ set ( OPENTURNS_INCLUDE_PATH
+       include/openturns
+       CACHE PATH "The directory where the header files are installed"
+     )
++set ( OPENTURNS_CONFIG_CMAKE_PATH
++      ${CMAKE_INSTALL_LIBDIR}/openturns
++      CACHE PATH "The directory where the CMake files are installed"
++    )
+ set ( OPENTURNS_SYSCONFIG_PATH
+       etc
+       CACHE PATH "The directory where the configuration file is installed"
+@@ -378,7 +382,7 @@ set ( OPENTURNS_TEMPDIR
+ set ( TEMPDIR ${OPENTURNS_TEMPDIR} )
+ 
+ # WARNING: This is where variables without OPENTURNS_ prefix are defined !
+-foreach ( _var INSTALL_PATH LIBRARY_PATH INCLUDE_PATH SYSCONFIG_PATH DATA_PATH WRAPPER_PATH EXAMPLE_PATH SAMPLE_PATH VALIDATION_PATH DOC_PATH )
++foreach ( _var INSTALL_PATH LIBRARY_PATH INCLUDE_PATH CONFIG_CMAKE_PATH SYSCONFIG_PATH DATA_PATH WRAPPER_PATH EXAMPLE_PATH SAMPLE_PATH VALIDATION_PATH DOC_PATH )
+   if ( IS_ABSOLUTE ${OPENTURNS_${_var}} )
+     set(${_var} ${OPENTURNS_${_var}})
+   else ( IS_ABSOLUTE ${OPENTURNS_${_var}} )
+Index: openturns/lib/CMakeLists.txt
+===================================================================
+--- openturns.orig/lib/CMakeLists.txt
++++ openturns/lib/CMakeLists.txt
+@@ -46,7 +46,7 @@ set ( OPENTURNS_VERSION_STRING ${PACKAGE
+ set ( OPENTURNS_VERSION_MAJOR  ${CPACK_PACKAGE_VERSION_MAJOR} )
+ set ( OPENTURNS_VERSION_MINOR  ${CPACK_PACKAGE_VERSION_MINOR} )
+ set ( OPENTURNS_VERSION_PATCH  ${CPACK_PACKAGE_VERSION_PATCH} )
+-set ( OPENTURNS_USE_FILE       ${LIBRARY_PATH}/UseOpenTURNS.cmake )
++set ( OPENTURNS_USE_FILE       ${CONFIG_CMAKE_PATH}/UseOpenTURNS.cmake )
+ 
+ if ( LIBXML2_FOUND )
+   list ( APPEND OPENTURNS_DEFINITIONS -DHAVE_LIBXML2 )
+@@ -63,7 +63,7 @@ configure_file ( ${PROJECT_SOURCE_DIR}/l
+ 
+ install ( FILES ${PROJECT_SOURCE_DIR}/lib/UseOpenTURNS.cmake
+                 ${PROJECT_BINARY_DIR}/lib/OpenTURNSConfig.cmake
+-          DESTINATION ${OPENTURNS_LIBRARY_PATH}
++          DESTINATION ${OPENTURNS_CONFIG_CMAKE_PATH}
+         )
+ 
+ install ( FILES AUTHORS
diff --git a/debian/patches/series b/debian/patches/series
index 5e23e58..43815e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian-soname.patch
 fix-bigendian.patch
 fix-dtd-search-path.patch
 kfreebsd-fix-t_WrapperFile_generic.patch
+install_cmake_files.patch
diff --git a/debian/rules b/debian/rules
index 6e170a3..987b875 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,7 @@ override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
             -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr \
             -DOPENTURNS_LIBRARY_PATH:PATH=lib \
+            -DOPENTURNS_CONFIG_CMAKE_PATH:PATH=lib/openturns \
             -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.1 \
             -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.1/wrappers \
             -DOPENTURNS_SYSTEM_INSTALL:BOOL=ON \

-- 
Debian packaging for openturns www.openturns.org