[exodus] 48/48: * Force build against hdf5 in unstable * B-D on csh as now triggered for some tests. * Add chrpath -d now needed for hdf5 change * New patch fix-cmake-hdf5.patch: fix cmake HDF5 detection to support hdf5 1.8.13 new packaging layout. * Now use 'xz' compression.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jul 15 11:36:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository exodus.
commit 7e0cc831669416cf4409fc98a789c0bd8da24002
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jul 15 11:06:25 2015 +0100
* Force build against hdf5 in unstable
* B-D on csh as now triggered for some tests.
* Add chrpath -d now needed for hdf5 change
* New patch fix-cmake-hdf5.patch: fix cmake HDF5 detection to support
hdf5 1.8.13 new packaging layout.
* Now use 'xz' compression.
---
debian/changelog | 24 +++++++
debian/control | 3 +-
debian/patches/fix-cmake-hdf5.patch | 124 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 +
debian/source/options | 1 +
6 files changed, 153 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 86742ba..168e0ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+exodusii (6.02.dfsg.1-5) unstable; urgency=medium
+
+ * Force build against hdf5 in unstable
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 14 Aug 2014 09:54:52 +0100
+
+exodusii (6.02.dfsg.1-4) unstable; urgency=medium
+
+ * B-D on csh as now triggered for some tests.
+ * Add chrpath -d now needed for hdf5 change
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 01 Aug 2014 07:38:46 +0100
+
+exodusii (6.02.dfsg.1-3) unstable; urgency=low
+
+ [Gilles Fillipini]
+ * New patch fix-cmake-hdf5.patch: fix cmake HDF5 detection to support
+ hdf5 1.8.13 new packaging layout.
+
+ [Alastair McKinstry]
+ Now use 'xz' compression.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 30 Jul 2014 13:52:08 +0100
+
exodusii (6.02.dfsg.1-2) unstable; urgency=medium
* Add zlib1g-dev and libhdf5-dev to B-D. Closes: #732325.
diff --git a/debian/control b/debian/control
index f5990bf..f7ba477 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: exodusii
Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9), cmake (>= 2.4.0), libnetcdf-dev, gfortran, chrpath, libhdf5-serial-dev, zlib1g-dev
+Build-Depends: debhelper (>= 9), cmake (>= 2.4.0), libnetcdf-dev, gfortran,
+ libhdf5-serial-dev, zlib1g-dev, csh, chrpath
Standards-Version: 3.9.5
Homepage: http://sourceforge.net/projects/exodusii/
diff --git a/debian/patches/fix-cmake-hdf5.patch b/debian/patches/fix-cmake-hdf5.patch
new file mode 100644
index 0000000..77ee4d1
--- /dev/null
+++ b/debian/patches/fix-cmake-hdf5.patch
@@ -0,0 +1,124 @@
+Author: Gilles Fillipini <pini at debian.org>
+Description: Build using new HDF5 1.8.13 packages with separate libs
+Bug-Debian: http://bugs.debian.org/75421
+Forwarded: no
+Last-Updated: 2014-07-29
+
+Index: exodusii-6.02.dfsg.1/exodus/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
++++ exodusii-6.02.dfsg.1/exodus/CMakeLists.txt 2014-07-24 17:35:52.113595013 +0200
+@@ -38,21 +38,7 @@
+ $ENV{NETCDF_DIR}/ncdump
+ )
+
+-# Hack for HDF5
+-find_library( HDF5_LIBRARY hdf5
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
+-find_library( HDF5HL_LIBRARY hdf5_hl
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
++find_package(HDF5)
+
+ # Check for ZLib, but only if using HDF5.
+ FIND_PACKAGE(ZLIB)
+Index: exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/nemesis/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
++++ exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt 2014-07-24 17:38:03.798020419 +0200
+@@ -34,22 +34,7 @@
+ $ENV{ACCESS}/lib
+ )
+
+-# Hack for HDF5
+-find_library( HDF5_LIBRARY hdf5
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
+-
+-find_library( HDF5HL_LIBRARY hdf5_hl
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
++find_package(HDF5)
+
+ find_library(Z_LIBRARY z
+ /usr/local/zlib/lib
+@@ -73,11 +58,11 @@
+ )
+
+ ADD_LIBRARY(nemesis ${SOURCES})
+-TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
++TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${Z_LIBRARY} ${MATH_LIBRARY})
+ set_target_properties(nemesis PROPERTIES VERSION 3.09.0 SOVERSION 3)
+
+ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
+-TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
++TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${Z_LIBRARY} ${MATH_LIBRARY})
+
+ INSTALL(TARGETS nemesis
+ RUNTIME DESTINATION lib COMPONENT Runtime
+Index: exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/cbind/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
++++ exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt 2014-07-24 17:40:07.530177780 +0200
+@@ -278,7 +278,7 @@
+
+ ADD_LIBRARY(exoIIv2c ${EXODUS_LIBRARY_TYPE} ${cbind_SRCS})
+
+-TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY} ${ZLIB_LIBRARY})
++TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_C_LIBRARIES} ${HDF5_HL_LIBRARIES} ${ZLIB_LIBRARY})
+
+ IF(MSVC)
+ set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
+Index: exodusii-6.02.dfsg.1/exodus/forbind/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/forbind/CMakeLists.txt 2013-12-14 19:32:57.000000000 +0100
++++ exodusii-6.02.dfsg.1/exodus/forbind/CMakeLists.txt 2014-07-24 17:40:15.758454657 +0200
+@@ -24,21 +24,7 @@
+ $ENV{NETCDF_DIR}/ncdump
+ )
+
+-# Hack for HDF5
+-find_library( HDF5_LIBRARY hdf5
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
+-find_library( HDF5HL_LIBRARY hdf5_hl
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
++find_package(HDF5)
+
+ INCLUDE_DIRECTORIES(
+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
+@@ -53,7 +39,7 @@
+
+ ADD_LIBRARY(exoIIv2for ${EXODUS_LIBRARY_TYPE} ${forbind_SRCS})
+
+-TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY})
++TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_C_LIBRARIES} ${HDF5_HL_LIBRARIES})
+
+ IF(EXODUS_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(exoIIv2for PROPERTIES ${EXODUS_LIBRARY_PROPERTIES})
diff --git a/debian/patches/series b/debian/patches/series
index 0f5df8f..1ee80ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
# security_warnings.patch
soversion.patch
+fix-cmake-hdf5.patch
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 99a7116..917da24
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ override_dh_auto_install:
dh_install -p libexodusii5 exodus-shared-build/cbind/$(EX_SONAME_FULL) $(LIBDIR)
dh_install -p libnemesis3 nemesis-shared-build/$(NE_SONAME_FULL) $(LIBDIR)
chrpath -d debian/libnemesis3/$(LIBDIR)/$(NE_SONAME_FULL)
+ chrpath -d debian/libexodusii5/$(LIBDIR)/$(EX_SONAME_FULL)
dh_link -p libexodusii5 $(LIBDIR)/$(EX_SONAME_FULL) $(LIBDIR)/$(EX_SONAME).$(EX_SO_MINOR)
dh_link -p libexodusii5 $(LIBDIR)/$(EX_SONAME_FULL) $(LIBDIR)/$(EX_SONAME)
dh_link -p libnemesis3 $(LIBDIR)/$(NE_SONAME_FULL) $(LIBDIR)/$(NE_SONAME).$(NE_SO_MINOR)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..b7bc1f2
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+compression = "xz"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/exodus.git
More information about the debian-science-commits
mailing list