[xdmf] 06/38: Use libgzstream(-dev) rather than local copy. Closes: #819710.

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit 89ee7d54fdc81eb54af0cd58824373e684c68c45
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Apr 1 15:03:50 2016 +0100

    Use libgzstream(-dev) rather than local copy. Closes: #819710.
---
 debian/changelog              |  1 +
 debian/control                |  5 +++--
 debian/patches/gzstream.patch | 17 +++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  3 ++-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b201737..71b9092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xdmf (2.1.dfsg.1-14) UNRELEASED; 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.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 16 Feb 2016 01:07:10 +0000
 
diff --git a/debian/control b/debian/control
index a349405..29066dd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), cmake(>= 2.4.0), 
   libhdf5-dev,
   libxml2-dev, python-all-dev, dh-python, gfortran, 
-  bzip2, libbz2-dev
+  bzip2, libbz2-dev,
+  libgzstream-dev
 Standards-Version: 3.9.7
 Homepage: http://www.xdmf.org/
 X-Python-Version: 2.7
@@ -35,7 +36,7 @@ Description: eXtensible Data Model and Format library
 Package: libxdmf-dev
 Section: libdevel
 Architecture: any
-Depends: libxdmf2  (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libxdmf2  (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, libgsztream-dev
 Description: eXtensible Data Model and Format development tools
  This package contains the headers and development tools needed to build
  against the Xdmf libraries.
diff --git a/debian/patches/gzstream.patch b/debian/patches/gzstream.patch
new file mode 100644
index 0000000..96a8c8a
--- /dev/null
+++ b/debian/patches/gzstream.patch
@@ -0,0 +1,17 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Delete (refs) to local gsztream, as we use libgzstream-dev on Debian
+Forwarded: not-needed
+Last-Updated: 2016-04-01
+
+Index: xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
+===================================================================
+--- xdmf-2.1.dfsg.1.orig/libsrc/CMakeLists.txt
++++ xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
+@@ -115,7 +115,6 @@ SET(CSHARP_SOURCES
+ 	)
+ 
+ SET( XdmfGzipSource
+-  gzstream
+    )
+ 
+ IF(XDMF_BUILD_VTK)
diff --git a/debian/patches/series b/debian/patches/series
index 85ba9f0..9cc31b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ soname.patch
 header-fix.patch
 reproducible-build.patch
 c++11.patch
+gzstream.patch
diff --git a/debian/rules b/debian/rules
index f733fb4..6f2eaef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ LIBDIR=usr/lib/${DEB_HOST_MULTIARCH}
 PYVER:=$(shell pyversions -r)
 PYTHON_LIB:=/usr/lib/${DEB_HOST_MULTIARCH)}/lib${PYVER}.so
 
-CXXFLAGS:= -I/usr/include/${PYVER} ${CXXFLAGS}
+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
@@ -62,5 +62,6 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f debian/cmake.patch
+	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