[cdo] 52/84: Build for netcdf4, on png12 | png16

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository cdo.

commit 1488b9388469497846e1715ec10e21c117007f12
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 3 23:34:55 2014 +0100

    Build for netcdf4, on png12 | png16
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62f231a..7e7a2fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cdo (1.6.3+dfsg.1-2) unstable; urgency=medium
+
+  * Include Build-Dep. on netcdf-bin. Without nc-config, cdo does not link in
+    netcdf4 properly. Closes: #720444.
+  * Enable build on libpng12 | libpng16. Closes: #743389.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 03 Apr 2014 23:25:02 +0100
+
 cdo (1.6.3+dfsg.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f2f7bee..1e344c0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake, libnetcdf-dev, gfortran, dh-autoreconf,
  libgrib-api-dev [!mips !hppa], libtool, libjasper-dev, cfortran,  libhdf5-serial-dev, libmagics++-dev [!mips !hppa],
- libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev, libpng12-dev | libpng-dev
+ libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev, libpng12-dev | libpng-dev, netcdf-bin
 Standards-Version: 3.9.5
 Homepage: https://code.zmaw.de/projects/cdo
 
diff --git a/debian/rules b/debian/rules
index 3ff1b28..2080ca2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ override_dh_auto_configure:
 		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr --with-hdf5=/usr \
 		--enable-iso-c-interface  \
 		 $(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS)  FC=gfortran \
-		LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \
+		LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \
 		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"
 	#rm -f libtool libcdi/libtool
 	#ln -sf /usr/bin/libtool libtool

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