[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.1_rc1-3-8-g52ea3df
Denis Barbier
bouzim at gmail.com
Wed Jan 9 23:11:03 UTC 2013
The following commit has been merged in the debian branch:
commit fe46cb21fdfb1002fa7d2cbaa802b3da342d3f3b
Author: Denis Barbier <bouzim at gmail.com>
Date: Wed Jan 9 21:02:44 2013 +0100
Drop patches merged upstream
debian/patches/fix-dtd-search-path.patch
debian/patches/install_cmake_files.patch
debian/patches/kfreebsd-fix-t_WrapperFile_generic.patch
diff --git a/debian/patches/fix-dtd-search-path.patch b/debian/patches/fix-dtd-search-path.patch
deleted file mode 100644
index 61802d9..0000000
--- a/debian/patches/fix-dtd-search-path.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Search for wrapper.dtd into all wrapper directories,
- and not only Path::GetStandardWrapperDirectory().
- Without this patch, t_WrapperFile_std.py fails.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: no
-Last-Update: 2012-12-9
-
-Index: openturns/lib/src/Base/Func/WrapperFile_version1.cxx
-===================================================================
---- openturns.orig/lib/src/Base/Func/WrapperFile_version1.cxx
-+++ openturns/lib/src/Base/Func/WrapperFile_version1.cxx
-@@ -41,7 +41,21 @@ static const FileName DTDFileName = "wra
- /* Get wrapper DTD file path */
- FileName GetDTDFileName_version1()
- {
-- const FileName DTDPath = Path::GetStandardWrapperDirectory() + Os::GetDirectorySeparator() + DTDFileName;
-+ // Get the directory list...
-+ std::vector<FileName> directoryList = Path::GetWrapperDirectoryList();
-+
-+ // ... and search it for the file
-+ FileName DTDPath;
-+ try
-+ {
-+ DTDPath = Path::FindFileByNameInDirectoryList(DTDFileName, directoryList);
-+
-+ }
-+ catch (FileNotFoundException & ex)
-+ {
-+ DTDPath = DTDFileName;
-+ }
-+
- return DTDPath;
- }
-
-Index: openturns/lib/src/Base/Func/WrapperFile_version2.cxx
-===================================================================
---- openturns.orig/lib/src/Base/Func/WrapperFile_version2.cxx
-+++ openturns/lib/src/Base/Func/WrapperFile_version2.cxx
-@@ -41,7 +41,20 @@ static const FileName DTDFileName = "wra
- /* Get wrapper DTD file path */
- FileName GetDTDFileName_version2()
- {
-- const FileName DTDPath = Path::GetStandardWrapperDirectory() + Os::GetDirectorySeparator() + DTDFileName;
-+ // Get the directory list...
-+ std::vector<FileName> directoryList = Path::GetWrapperDirectoryList();
-+
-+ // ... and search it for the file
-+ FileName DTDPath;
-+ try
-+ {
-+ DTDPath = Path::FindFileByNameInDirectoryList(DTDFileName, directoryList);
-+
-+ }
-+ catch (FileNotFoundException & ex)
-+ {
-+ DTDPath = DTDFileName;
-+ }
- return DTDPath;
- }
-
diff --git a/debian/patches/install_cmake_files.patch b/debian/patches/install_cmake_files.patch
deleted file mode 100644
index eec9a5e..0000000
--- a/debian/patches/install_cmake_files.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/kfreebsd-fix-t_WrapperFile_generic.patch b/debian/patches/kfreebsd-fix-t_WrapperFile_generic.patch
deleted file mode 100644
index 68902dd..0000000
--- a/debian/patches/kfreebsd-fix-t_WrapperFile_generic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Partially disable t_WrapperFile_generic
- to not fail on kfreebsd.
- There is a strange bug on Linux, messages are printed
- twice when output is redirected. To workaround this bug,
- messages are printed twice on non-Linux platforms.
- It seems that kfreebsd suffers from the same bug, because
- messages are printed four times.
- The simplest solution is to not print this message.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: no
-Last-Update: 2012-12-9
-
-Index: openturns/python/test/t_WrapperFile_generic.expout
-===================================================================
---- openturns.orig/python/test/t_WrapperFile_generic.expout
-+++ openturns/python/test/t_WrapperFile_generic.expout
-@@ -1,5 +1,3 @@
--[101,255]
--[101,255]
- [25755]
- 0 1
- 0 1
-Index: openturns/python/test/t_WrapperFile_generic.py
-===================================================================
---- openturns.orig/python/test/t_WrapperFile_generic.py
-+++ openturns/python/test/t_WrapperFile_generic.py
-@@ -60,12 +60,6 @@ try:
- model = NumericalMathFunction( wrp )
-
- inP = NumericalPoint( (101,255) )
-- print inP
--
-- # FIXME: on linux / python2 the point is printed twice when redirecting output
-- if not (('linux' in sys.platform) and (sys.version_info[0] == 2)):
-- print inP
--
- outP = model( inP )
- print outP
-
diff --git a/debian/patches/series b/debian/patches/series
index 43815e8..ff3629d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
debian-soname.patch
fix-bigendian.patch
-fix-dtd-search-path.patch
-kfreebsd-fix-t_WrapperFile_generic.patch
-install_cmake_files.patch
--
Debian packaging for openturns www.openturns.org
More information about the debian-science-commits
mailing list