[cdo] 10/16: Remove obsolete dependencies on openjpeg and libpng. Closes: #826809

[Alastair McKinstry]

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

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

commit d2a82e6c67909a854972d8b0d55dfb41385cf37a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jun 19 08:06:17 2016 +0100

    Remove obsolete dependencies on openjpeg and libpng. Closes: #826809
---
 debian/changelog | 6 +++---
 debian/control   | 4 +---
 debian/rules     | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed54684..4f4486d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-cdo (1.7.1+dfsg.1-3) UNRELEASED; urgency=medium
+cdo (1.7.1+dfsg.1-3) unstable; urgency=medium
 
-  * Now use openjpeg2 not openjpeg. Closes: #826809
+  * Remove obsolete dependencies on openjpeg and libpng. Closes: #826809
 
- -- Alastair McKinstry <mckinstry at debian.org>  Thu, 09 Jun 2016 12:37:32 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 19 Jun 2016 08:06:00 +0100
 
 cdo (1.7.1+dfsg.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 55b4683..1be16b4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,10 @@ Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake,
  libnetcdf-dev, netcdf-bin, libhdf5-serial-dev,  
  libfftw3-dev, libudunits2-dev,
  gfortran, dh-autoreconf, 
- libopenjp2-7-dev,
  libgrib-api-dev (>= 1.14.5-2), 
  libtool, cfortran,
  libmagics++-dev (>= 2.24.7-7),
- libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev,
- libpng-dev
+ libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev
 Standards-Version: 3.9.8
 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 7d776b6..4fc6047 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,11 +69,11 @@ 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-openjpeg=/usr \
+		--with-szlib \
 		--with-grib-api=/usr --disable-cgribex --with-magics=/usr  FC=gfortran \
-		LIBS=" -lpng -lopenjpeg -lm -ljpeg -lz -lcurl" \
+		LIBS="-lm -ljpeg -lz -lcurl" \
 		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"
-		# LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" 
+		# LIBS="-Wl,-Bstatic -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" 
 
 override_dh_auto_install:
 	dh_auto_install

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