[cdo] 02/02: * Drop libjasper, use openjpeg instead, as jasper is jasper is being removed from Debian (obsolete; insecure). * Drop hppa-specific build options; grib-api now builds on grib-api. * Standards-Version: 3.9.7; no changes required.

[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 2b1c65f812213aa33c0b3f55531d6721c12bf8cc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 1 14:09:47 2016 +0000

    * Drop libjasper, use openjpeg instead, as jasper is jasper is being removed
      from Debian (obsolete; insecure).
    * Drop hppa-specific build options; grib-api now builds on grib-api.
    * Standards-Version: 3.9.7; no changes required.
---
 debian/changelog |  9 +++++++++
 debian/control   |  7 ++++---
 debian/rules     | 16 +++-------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c5b9c1..516b6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cdo (1.7.0+dfsg.1-3) unstable; urgency=medium
+
+  * Drop libjasper, use openjpeg instead, as jasper is jasper is being removed
+    from Debian (obsolete; insecure).
+  * Drop hppa-specific build options; grib-api now builds on grib-api.
+  * Standards-Version: 3.9.7; no changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 01 Mar 2016 14:09:33 +0000
+
 cdo (1.7.0+dfsg.1-2) unstable; urgency=medium
 
   * Change B-D to libpng-dev for png16 transition. Closes: #810171
diff --git a/debian/control b/debian/control
index fbc4c3b..4629655 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,13 @@ Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake,
  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,
+ gfortran, dh-autoreconf, libopenjpeg-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
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 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 2ae045e..af5db31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,7 @@ export DEB_CFLAGS_MAINT_APPEND
 CPPFLAGS += -DgFortran
 
 ARCH:=$(shell dpkg --print-architecture)
-WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
-WITH_JASPER:= --with-jasper=/usr
 AS_NEEDED= -Wl,--as-needed
-WITH_MAGICS:= --with-magics=/usr
 
 # On powerpc, amd64, arm*, don't do fPIE, only relro
 ifeq ($(ARCH), amd64)
@@ -42,13 +39,6 @@ ifeq ($(ARCH),powerpc)
   export CFLAGS= -g -O2 -Wall
 endif
 
-# grib-api not available on these arches; jasper is only needed for grib-api
-ifeq ($(ARCH), hppa)
-  WITH_GRIB:=
-  WITH_JASPER:=
-  WITH_MAGICS:=
-endif
-
 ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
   WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 else
@@ -79,9 +69,9 @@ 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" \
+		--with-szlib --with-openjpeg=/usr \
+		--with-grib-api=/usr --disable-cgribex --with-magics=/usr  FC=gfortran \
+		LIBS=" -lpng -lopenjpeg -lm -ljpeg -lz -lcurl" \
 		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"
 		# LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" 
 

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