[cdo] 02/02: Merge tag 'debian/1.6.6+dfsg.1-2' into debian/jessie-backports

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/jessie-backports
in repository cdo.

commit c3cdccb7f9fb9aaef4bd7a24090a8363e9fbae66
Merge: 80a9a5b 880826c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 13 11:10:15 2015 +0100

    Merge tag 'debian/1.6.6+dfsg.1-2' into debian/jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog | 5 ++++-
 debian/control   | 8 ++++----
 debian/rules     | 7 +------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index adb8301,b320cd2..c173f63
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,8 -5,11 +5,11 @@@ cdo (1.6.6+dfsg.1-2) unstable; urgency=
      ppc64el code. 
    * Additional fix ore reproducible build: set hostname, username to 
      constant values. 
+   * Now link against gribapi on mips as it is available
 -  * Enable libfftw3 support
++  * Enable libfftw3 support, udunits2 explicity
+   * Enable --with-curl explicitly
  
-  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 13 Jul 2015 08:58:40 +0100
+  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 13 Jul 2015 10:11:01 +0100
  
  cdo (1.6.6+dfsg.1-1) unstable; urgency=medium
  

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