[ncl] 04/04: Fix needed for hppa, kfreebsd (+hppa?) 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 ncl.

commit bbe6e148fdfa52c97cecf8944e4a81b0d4c615de
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Oct 31 13:36:34 2017 +0000

    Fix needed for hppa, kfreebsd (+hppa?) support
---
 debian/changelog                   |  1 +
 debian/patches/support-archs.patch | 12 +++++++++++-
 debian/rules                       |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9073fd7..d0273e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ncl (6.4.0-5) UNRELEASED; urgency=medium
   * Use libhdf5-dev instead of transitional libhdf5-serial-dev
   * Standards-Version: 4.1.1; no changes required
   * Use libopenblas on more archs as available
+  * Fix needed for hppa, kfreebsd (+hppa?) support
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 31 Oct 2017 12:30:24 +0000
 
diff --git a/debian/patches/support-archs.patch b/debian/patches/support-archs.patch
index 66fe6d8..63fabe8 100644
--- a/debian/patches/support-archs.patch
+++ b/debian/patches/support-archs.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Support more architectures under Debian.
-Last-Updated: 2017-04-17
+Last-Updated: 2017-10-31
 Forwarded: no
 
 Index: ncl-6.4.0/config/ymake
@@ -63,3 +63,13 @@ Index: ncl-6.4.0/config/ymake
          default:
              echo "$0 : Unknown machine type" 
              exit 1
+--- ncl-6.4.0.orig/config/ymake
++++ ncl-6.4.0/config/ymake
+@@ -665,6 +665,7 @@ case    UNICOS:
+         breaksw
+ case    Linux:
+ case	FreeBSD:
++case    DEBIAN:
+ case    CYGWIN:
+         set cppopt = -traditional-cpp
+         breaksw
diff --git a/debian/rules b/debian/rules
index 7343b8d..56be41d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,9 +73,9 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	# First do spherepack. (Later replace this with external spherepack)
 	cp config/Site.local.shared config/Site.local
-	echo 'n' | ./Configure -v
 	cp debian/LINUX.DEBIAN config/LINUX
 	ln -sf LINUX config/DEBIAN
+	echo 'n' | ./Configure -v
 	$(MAKE) Makefiles includes depend
 	$(MAKE) -C external/sphere3.1_dp install INCSEARCH=${INCS} INC_SEARCH=${INCS}
 	# Static libraries need to be built first

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