[cdo] 10/84: Add fixes

[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 2f7b46f6e1d4f210c5839fe403fff55931c10725
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 30 12:20:33 2012 +0000

    Add fixes
---
 debian/changelog | 8 ++++++++
 debian/control   | 3 ++-
 debian/rules     | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6ded11..1bf9d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cdo (1.5.9+dfsg.1-2) unstable; urgency=low
+
+  * Add explicit dependency on multiple flavours of libcurl-*-dev.
+    Closes: #696971.
+  * Add "-lm" to link line for -as-needed on Ubuntu. Closes: #692651.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 30 Dec 2012 12:08:26 +0000
+
 cdo (1.5.9+dfsg.1-1) unstable; urgency=low
 
   * New upstream release. 
diff --git a/debian/control b/debian/control
index 1235ef8..932fd12 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: utils
 Priority: extra
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 8.1.3~), dh-buildinfo, libproj-dev, autoconf, automake, libnetcdf-dev, gfortran, dh-autoreconf,
- libgrib-api-dev [!mips !sparc !hppa], libtool, libjasper-dev, cfortran,  libhdf5-serial-dev, libmagics++-dev
+ libgrib-api-dev [!mips !sparc !hppa], libtool, libjasper-dev, cfortran,  libhdf5-serial-dev, libmagics++-dev,
+ libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev
 Standards-Version: 3.9.4
 Homepage: https://code.zmaw.de/projects/cdo
 
diff --git a/debian/rules b/debian/rules
index b64cefb..b529d54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
 # The magic debhelper  rule
 %:
@@ -57,7 +57,7 @@ override_dh_auto_configure:
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
 		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr --with-hdf5=/usr \
 		--enable-iso-c-interface   --with-magics=/usr \
-		 $(WITH_GRIB) $(WITH_JASPER)  FC=gfortran LIBS="-Wl,-Bstatic -lpng12 -ljasper -ljpeg -lz -Wl,-Bdynamic -lcurl"
+		 $(WITH_GRIB) $(WITH_JASPER)  FC=gfortran LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl"
 	rm -f libtool libcdi/libtool
 	ln -sf /usr/bin/libtool libtool
 	ln -sf /usr/bin/libtool libcdi/libtool

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