[cdo] 08/16: Disable experimental cmor support

[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 12c34dab913deb6060ab56460cce18398c5aace2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 26 20:50:41 2016 +0100

    Disable experimental cmor support
---
 debian/changelog | 6 ++++++
 debian/control   | 3 +--
 debian/rules     | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a30013e..0470f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cdo (1.7.1+dfsg.1-2) unstable; urgency=medium
+
+  * Disable experimental cmor support
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 26 May 2016 20:50:09 +0100
+
 cdo (1.7.1+dfsg.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 0d8009d..47a0944 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,7 @@ Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake,
  libtool, cfortran,
  libmagics++-dev (>= 2.24.7-7),
  libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev,
- libpng-dev,
- libcmor-dev
+ libpng-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 a8bb333..7d776b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,6 @@ override_dh_auto_configure:
 		--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-cmor=/usr \
 		--with-grib-api=/usr --disable-cgribex --with-magics=/usr  FC=gfortran \
 		LIBS=" -lpng -lopenjpeg -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