[ncl] 14/22: * Preferentially use openblas not blas * Standards-Version: 3.9.8. No changes required * Allow -fdebug-prefix-map in CFLAGS (change sed in rules). Closes: #832011

[Alastair McKinstry]

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

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

commit 5a3cc508f9d202ea011f47ce6c1dffd567f3fc91
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Aug 13 19:27:12 2016 +0100

    * Preferentially use openblas not blas
    * Standards-Version: 3.9.8. No changes required
    * Allow -fdebug-prefix-map in CFLAGS (change sed in rules). Closes: #832011
---
 debian/changelog |  8 ++++++++
 debian/control   |  6 ++++--
 debian/rules     | 28 ++++++++++++++--------------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36ff9d0..9d5260b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ncl (6.3.0-8) unstable; urgency=medium
+
+  * Preferentially use openblas not blas
+  * Standards-Version: 3.9.8. No changes required
+  * Allow -fdebug-prefix-map in CFLAGS (change sed in rules). Closes: #832011
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 13 Aug 2016 18:59:17 +0100
+
 ncl (6.3.0-7) unstable; urgency=medium
 
   * Add -lsz to the static libraries needed in ncarg.pc
diff --git a/debian/control b/debian/control
index c4c9aea..cf12eeb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,14 @@ Build-Depends: flex, bison, gfortran, zlib1g-dev, libbz2-dev, libxt-dev,
  pkg-config, fontconfig, libfontconfig1-dev, libfreetype6-dev, libexpat1-dev,
  libpixman-1-dev,  libcurl4-gnutls-dev | libcurl-dev,  libgdal-dev,
  libnetcdf-dev, libnetcdff-dev, libudunits2-dev, libmotif-dev,
- libatlas-dev, liblapack-dev, libblas-dev, libatlas3-base,
+ libatlas-dev, libatlas3-base,
+ liblapack-dev, 
+ libopenblas-dev | libblas-dev, 
  libgrib2c-dev, libsphere-dev, libhdf4-alt-dev, libhdfeos-dev,
  libgctp-dev, libhe5-hdfeos-dev, tcsh | csh | c-shell,
  debhelper (>= 9), libhdf5-serial-dev | libhdf5-dev,
  libproj-dev, libaec-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: http://www.ncl.ucar.edu/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/ncl.git
 
diff --git a/debian/rules b/debian/rules
index a7686e9..6084c08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,22 +48,22 @@ override_dh_auto_configure:
 	    -e 's/@PREFIX@/\/usr/' \
 	    -e 's/@VERSION@/$(VERSION)/' \
 	< debian/ncarg.pc.in > ncarg.pc
-	sed -e 's/@CC@/${CC}/' \
-	    -e 's/@FC@/${FC}/' \
-	    -e 's/@LD@/${CC}/' \
-	    -e 's:@CFLAGS@:${CFLAGS}:' \
-	    -e 's/@FFLAGS@/${FFLAGS}/' \
-	    -e 's/@CPPFLAGS@/${CPPFLAGS}/' \
-	    -e 's/@LDFLAGS@/${LDFLAGS}/' \
+	sed -e 's%@CC@%${CC}%' \
+	    -e 's%@FC@%${FC}%' \
+	    -e 's%@LD@%${CC}%' \
+	    -e 's%@CFLAGS@%${CFLAGS}%' \
+	    -e 's%@FFLAGS@%${FFLAGS}%' \
+	    -e 's%@CPPFLAGS@%${CPPFLAGS}%' \
+	    -e 's%@LDFLAGS@%${LDFLAGS}%' \
 	    -e 's%@DESTDIR@%${DESTDIR}%' \
 	< debian/Site.local.shared.in > config/Site.local.shared
-	sed -e 's/@CC@/${CC}/' \
-	    -e 's/@FC@/${FC}/' \
-	    -e 's/@LD@/${CC}/' \
-	    -e 's:@CFLAGS@:${CFLAGS}:' \
-	    -e 's/@FFLAGS@/${FFLAGS}/' \
-	    -e 's/@CPPFLAGS@/${CPPFLAGS}/' \
-	    -e 's/@LDFLAGS@/${LDFLAGS}/' \
+	sed -e 's%@CC@%${CC}%' \
+	    -e 's%@FC@%${FC}%' \
+	    -e 's%@LD@%${CC}%' \
+	    -e 's%@CFLAGS@%${CFLAGS}%' \
+	    -e 's%@FFLAGS@%${FFLAGS}%' \
+	    -e 's%@CPPFLAGS@%${CPPFLAGS}%' \
+	    -e 's%@LDFLAGS@%${LDFLAGS}%' \
 	    -e 's%@DESTDIR@%${DESTDIR}%' \
 	< debian/Site.local.static.in > config/Site.local.static
 	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%' \

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