[xdmf] 13/38: merge
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 13 15:16:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository xdmf.
commit 3499004895c2711299fc948c1245b3c793e3a8c4
Merge: 60b7b45 520310e
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 20 19:10:52 2016 +0100
merge
debian/changelog | 31 ++++++++++++-
debian/control | 13 +++---
debian/libxdmf2.postinst | 5 ---
debian/libxdmf2.postrm | 5 ---
debian/patches/c++11.patch | 79 +++++++++++++++++++++++++++++++++
debian/patches/cmake-changes.patch | 40 -----------------
debian/patches/gzstream.patch | 38 ++++++++++++++++
debian/patches/header-fix.patch | 5 +++
debian/patches/python-install-dir.patch | 19 ++++++++
debian/patches/reproducible-build.patch | 18 ++++++++
debian/patches/series | 5 ++-
debian/rules | 19 ++++----
12 files changed, 211 insertions(+), 66 deletions(-)
diff --cc debian/changelog
index f73466b,5abfd2a..b8fc377
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,34 +1,35 @@@
- xdmf (2.1.dfsg.1-13) UNRELEASED; urgency=medium
+ xdmf (2.1.dfsg.1-16) UNRELEASED; urgency=medium
+ * Add python3 support
+ * Standards-Version: 3.9.8
+ * Remove unnecessary postinst, prerm scripts
- -- Alastair McKinstry <mckinstry at debian.org> Sat, 12 Sep 2015 07:59:45 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 20 Jun 2016 13:42:30 +0100
+
+ xdmf (2.1.dfsg.1-15) unstable; urgency=medium
+
+ * Fix Typo in depends lib*gz*stream-dev. Closes: 819872
+ * Patch from Katsuhiko Nishimra fixes wrong byte-compiles of python
+ Closes: 819879
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 03 Apr 2016 14:18:21 +0100
+
+ xdmf (2.1.dfsg.1-14) unstable; urgency=medium
+
+ * Move to Standards-Version: 3.9.7.
+ * Fix FTBFS with g++ 6 (c++11). Closes: #811850.
+ * Use libgzstream(-dev) rather than local copy. Closes: #819710.
+ * Add Vcs-Git pointing to debian-science repo. Closes: #756861.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 01 Apr 2016 19:19:22 +0100
+
+ xdmf (2.1.dfsg.1-13) unstable; urgency=medium
+
+ * Add patch to remove kernel version from XdmfConfig.h for reproducible
+ build.
+ * Remove obsolete patch for cmake; add headers to patches for docs.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 20 Oct 2015 18:33:55 +0100
xdmf (2.1.dfsg.1-12) experimental; urgency=medium
diff --cc debian/control
index d3991ee,2f0115a..69764bf
--- a/debian/control
+++ b/debian/control
@@@ -2,14 -2,15 +2,17 @@@ Source: xdm
Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
- Build-Depends: debhelper (>= 9), cmake(>= 2.4.0), gfortran,
+ Build-Depends: debhelper (>= 9), cmake(>= 2.4.0),
- libhdf5-dev,
- libxml2-dev, python-all-dev, dh-python, gfortran,
+ libhdf5-serial-dev, libhdf5-mpi-dev,
- dh-python, python-all-dev, python3-all-dev,
- libxml2-dev, bzip2, libbz2-dev
- Standards-Version: 3.9.6
++ libxml2-dev,
++ python-all-dev, dh-python, python3-all-dev, gfortran,
+ bzip2, libbz2-dev,
+ libgzstream-dev
+ Standards-Version: 3.9.8
Homepage: http://www.xdmf.org/
+ Vcs-Git: git://anonscm.debian.org/debian-science/packages/xdmf.git
X-Python-Version: 2.7
+X-Python3-Version: 3.4+
Package: libxdmf2
Provides: libxdmf2
diff --cc debian/rules
index 33516ad,6ac930b..643048c
--- a/debian/rules
+++ b/debian/rules
@@@ -12,40 -9,37 +12,42 @@@ MPI:=$(ARCH_DEFAULT_MPI_IMPL
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
TMPDIR=debian/tmp
-LIBDIR=usr/lib/${DEB_HOST_MULTIARCH}
-PYVER:=$(shell pyversions -r)
-PYTHON_LIB:=/usr/lib/${DEB_HOST_MULTIARCH)}/lib${PYVER}.so
+LIBDIR=/usr/lib/${DEB_HOST_MULTIARCH}
+PY2VER:=$(shall pyversions -s)
+PY3VER:=$(shell py3versions -s)
+PYTHON_LIB:=${LIBDIR}/lib${PY2VER}.so
- CXXFLAGS:= -I/usr/include/python2.7 ${CXXFLAGS}
++# FIXME: Pass different CXXFLAGS to different builds
+ CXXFLAGS:= -I/usr/include/${PYVER} ${CXXFLAGS}
-# Later sort out doing serial + mpi builds ?
-# When the co-installable transition is complete, we will B-D on both
-# and build a libxdmf-mpi library too.
-ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
- HDF5_INC := /usr/include/hdf5/serial
- HDF5_LIB := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so
-else
- HDF5_INC := /usr/include
- HDF5_LIB := /usr/lib/$(DEB_HOST_MULTIARCH)/libhdf5.so
-endif
-
-override_dh_auto_configure:
- dh_auto_configure -- \
- -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON -DXDMF_USE_GZIP=ON \
+CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON -DXDMF_USE_GZIP=ON \
-DXDMF_SYSTEM_HDF5=ON \
-DXDMF_USE_RPATH=OFF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DXDMF_WRAP_PYTHON=ON \
- -DXDMF_BUILD_MPI=OFF \
- -DPYTHON_INCLUDE_PATH="/usr/include/${PYVER}" \
+ -DPYTHON_INCLUDE_PATH="/usr/include/${PY2VER}" \
- -DPYTHON_LIBRARY=${PYTHON_LIB}
+ -DPYTHON_LIBRARY=${PYTHON_LIB} \
- -DHDF5_INCLUDE_PATH=$(HDF5_INC) \
- -DHDF5_LIBRARY=$(HDF5_LIB) \
+ -DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so
+override_dh_auto_configure:
- mkdir -p debian/build-mpi debian/build-serial
- (cd debian/build-serial && cmake ../.. \
++ mkdir -p debian/build-mpi-2 debian/build-serial-2 debian/build-mpi-3 debian/build-serial-3
++ (cd debian/build-serial-2 && cmake ../.. \
+ $(CMAKE_FLAGS) \
+ -DXDMF_BUILD_MPI=OFF \
+ -DXDMF_SYSTEM_HDF5_IS_PARALLEL=OFF \
+ -DHDF5_INCLUDE_PATH=/usr/include/hdf5/serial \
+ -DHDF5_LIBRARY=$(LIBDIR)/hdf5/serial )
- (cd debian/build-mpi && cmake ../.. \
++ (cd debian/build-mpi-2 && cmake ../.. \
+ $(CMAKE_FLAGS) \
+ -DXDMF_BUILD_MPI=ON \
+ -DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
+ -DHDF5_INCLUDE_PATH=/usr/include/hdf5/$(MPI) \
+ -DHDF5_LIBRARY=$(LIBDIR)/hdf5/$(MPI) )
+
+override_dh_auto_build:
- $(MAKE) -C debian/build-serial
- $(MAKE) -C debian/build-mpi
++ $(MAKE) -C debian/build-serial-2
++ $(MAKE) -C debian/build-mpi-3
+
# -DXDMF_SYSTEM_HDF5=ON -DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
# later, add -DXDMF_BUILD_UTILS=ON CMAKE_C_FLAGS_RELEASE="-O3 -NDEBUG" CMAKE_EXE_LINKER_FLAGS
@@@ -69,5 -63,6 +71,6 @@@ override_dh_auto_install
override_dh_auto_clean:
dh_auto_clean
rm -f debian/cmake.patch
+ rm -rf debian/build-*
-
+ rm -f libsrc/gzstream*
+ -find . -name CVS -exec rm -rf {} \;
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xdmf.git
More information about the debian-science-commits
mailing list