[grads] 09/10: Patch to use NC_CONFIG in /usr/bin

[Alastair McKinstry]

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

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

commit eb236450644d33bab6405d611daba2cab09a2f79
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue May 24 09:42:07 2016 +0100

    Patch to use NC_CONFIG in /usr/bin
---
 debian/changelog               |  1 +
 debian/patches/nc-config.patch | 13 +++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d77058..e4b37ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ grads (2:2.1~a3-2) UNRELEASED; urgency=medium
   * Depend on libgrib2c-dev >= 1.6.0-3 to remove Jasper. Closes: #818214.
   * Depend on libpng-dev >= 1.6.21; png16 transition done.
   * Enable png16 patch, look for it, not png15
+  * Patch to use NC_CONFIG in /usr/bin
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 12 May 2016 21:43:55 +0100
 
diff --git a/debian/patches/nc-config.patch b/debian/patches/nc-config.patch
new file mode 100644
index 0000000..e80474b
--- /dev/null
+++ b/debian/patches/nc-config.patch
@@ -0,0 +1,13 @@
+Index: grads-2.1~a3/configure.ac
+===================================================================
+--- grads-2.1~a3.orig/configure.ac
++++ grads-2.1~a3/configure.ac
+@@ -834,7 +834,7 @@ else
+           ],,
+           [])
+         ])
+-       NC_CONFIG="`pkg-config --variable=prefix netcdf`/bin/nc-config"
++       NC_CONFIG="/usr/bin/nc-config"
+     fi
+     if test $use_nc4 != "yes" ; then
+       AC_DEFINE(USENETCDF, 0, [Enable netcdf])
diff --git a/debian/patches/series b/debian/patches/series
index 31ee8b4..5903722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # hdf4-netcdf.patch
+nc-config.patch
 hdf4-alt.patch
 supplibs.patch
 paths.patch

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