[open-coarrays] 05/80: First working package

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository open-coarrays.

commit 9ba9a13d795ba7375ed51617d60d3dc68d7322d3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 2 18:19:41 2016 +0100

    First working package
---
 debian/control                       | 45 +++++++++++++++++++-----------------
 debian/libcoarrays-dev.install       |  3 +++
 debian/open-coarray-bin.install      |  2 ++
 debian/patches/disable-ns-test.patch | 24 +++++++++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         |  9 +++++++-
 6 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index afb757a..5804cad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,29 +3,32 @@ Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo,
- mpi-default-dev
+ mpi-default-dev,
+ cmake (>= 3.3.1-1),
+ gfortran (>= 6.1-1)
 Standards-Version: 3.9.8
-Homepage: https://code.zmaw.de/projects/cdo
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/cdo.git
+Homepage: https://www.opencoarrays.org/
 
 Package: libcoarrays-dev
-Section: utils
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libcdi0 ( = ${binary:Version})
-Description: Climate Data Operators
- Climate Data Operators are a collection of command line Operators 
- to manipulate and analyse Climate model Data.  Supported data formats are GRIB, 
- netCDF, SERVICE, EXTRA and IEG. There are more than 400 operators available.
-
-Package: libcdi0
-Section: libs
+Section: libdevel
 Architecture: any
-Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Climate Data Interface (cdi) library
- CDI is a C and Fortran Interface to access Climate model Data.
- Supported data formats are GRIB, netCDF, SERVICE, EXTRA and IEG.
-
+Depends: ${misc:Depends}, ${shlibs:Depends}, gfortran (>= 6.1-1), mpi-default-bin
+Description: MPI Co-Array Fortran library for gfortran
+ OpenCoArrays is an open-source software project that supports the 
+ coarray Fortran (CAF) parallel programming features of the Fortran 2008 
+ standard and several features proposed for Fortran 2015 in the draft 
+ Technical Specification [TS 18508] "Additional Parallel Features in Fortran".
+ .
+ This package provides the libraries necessary for gfortran to build parallel
+ CAF programs built on top of MPI.
 
+Package: open-coarrays-bin
+Depends: ${misc:Depends}, libcoarrays-dev = (= ${binary:Version})
+Architecture: all
+Description: Executables for running Co-Array Fortran programs
+ OpenCoArrays is an open-source software project that supports the
+ coarray Fortran (CAF) parallel programming features of the Fortran 2008
+ standard and several features proposed for Fortran 2015 in the draft
+ Technical Specification [TS 18508] "Additional Parallel Features in Fortran".
+ .
+ This package provides utility executables for running CAF programs.
diff --git a/debian/libcoarrays-dev.install b/debian/libcoarrays-dev.install
new file mode 100644
index 0000000..ec1a3d5
--- /dev/null
+++ b/debian/libcoarrays-dev.install
@@ -0,0 +1,3 @@
+/usr/lib/cmake/*
+/usr/lib/*.a
+/usr/mod/*	/usr/include
diff --git a/debian/open-coarray-bin.install b/debian/open-coarray-bin.install
new file mode 100644
index 0000000..c11093c
--- /dev/null
+++ b/debian/open-coarray-bin.install
@@ -0,0 +1,2 @@
+/usr/bin/caf
+/usr/bin/cafrun
diff --git a/debian/patches/disable-ns-test.patch b/debian/patches/disable-ns-test.patch
new file mode 100644
index 0000000..18c7d3f
--- /dev/null
+++ b/debian/patches/disable-ns-test.patch
@@ -0,0 +1,24 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Disable navier-stokes test that fails due to hard-coded fft library
+Last-Updated: 2016-06-02
+Forwarded: not-needed
+
+Index: open-coarrays-1.6.0/CMakeLists.txt
+===================================================================
+--- open-coarrays-1.6.0.orig/CMakeLists.txt
++++ open-coarrays-1.6.0/CMakeLists.txt
+@@ -189,10 +189,10 @@ if(opencoarrays_aware_compiler)
+   add_mpi_test(coarray_burgers_pde 2 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
+   add_mpi_test(co_heat 2 ${tests_root}/integration/pde_solvers/coarrayHeatSimplified/co_heat)
+   if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
+-    if ( NOT (DEFINED ENV{TRAVIS}))
+-      add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
+-      set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
+-    endif()
++    #if ( NOT (DEFINED ENV{TRAVIS}))
++    #  add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
++    #  set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
++    #endif()
+   endif()
+ else()
+   add_test(co_sum_extension ${tests_root}/unit/extensions/test-co_sum-extension.sh)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a91789e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-ns-test.patch
diff --git a/debian/rules b/debian/rules
index f6564cb..ff9ccde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,16 @@ export DH_VERBOSE=1
 
 # The magic debhelper  rule
 %:
-	dh $@ --with cmake
+	dh $@ --buildsystem=cmake
 
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
+override_dh_auto_configure:
+	        CC=mpicc FC=mpifort \
+			dh_auto_configure
+
+
+override_dh_auto_test:
+	TRAVIS=true dh_auto_test

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