[cdo] 01/02: * Change B-D to libpng-dev for png16 transition. Closes: #810171 * Add szlib support using libaec-dev.

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.7.0+dfsg.1-3
in repository cdo.

commit e68f4b0dc392e8fb909beb4d08d2e0810eafffe6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jan 7 17:36:03 2016 +0000

    * Change B-D to libpng-dev for png16 transition. Closes: #810171
    * Add szlib support using libaec-dev.
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4929179..6c5b9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cdo (1.7.0+dfsg.1-2) unstable; urgency=medium
+
+  * Change B-D to libpng-dev for png16 transition. Closes: #810171
+  * Add szlib support using libaec-dev.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 Jan 2016 17:31:14 +0000
+
 cdo (1.7.0+dfsg.1-1) unstable; urgency=medium
 
   * New upstream build. 
diff --git a/debian/control b/debian/control
index 216869e..fbc4c3b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake,
  libnetcdf-dev, netcdf-bin,
- libhdf5-dev | libhdf5-serial-dev, 
+ libhdf5-dev | libhdf5-serial-dev, libaec-dev,
  libnetcdf-dev, netcdf-bin, libhdf5-serial-dev,  
  libfftw3-dev, libudunits2-dev,
  gfortran, dh-autoreconf,
  libgrib-api-dev [!hppa], libtool, libjasper-dev, cfortran,
  libmagics++-dev (>= 2.24.7-7),
  libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev,
- libpng12-dev | libpng-dev
+ libpng-dev
 Standards-Version: 3.9.6
 Homepage: https://code.zmaw.de/projects/cdo
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/cdo.git
diff --git a/debian/rules b/debian/rules
index 5cf1b60..2ae045e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ override_dh_auto_configure:
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
 		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr $(WITH_HDF5) \
 		--enable-iso-c-interface  --with-fftw3 --with-curl=/usr --with-udunits2=/usr \
+		--with-szlib \
 		 $(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS)  FC=gfortran \
 		LIBS=" -lpng -ljasper -lm -ljpeg -lz -lcurl" \
 		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git