[emos] 01/05: Merge branch 'upstream' into debian/master

[Alastair McKinstry]

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

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

commit deb8b8548d4e514fe5790aba0f4989f0ff79591a
Merge: e93b6d1 bf84ca0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Oct 20 21:26:10 2015 +0100

    Merge branch 'upstream' into debian/master

 CMakeLists.txt                              |  24 +-
 ChangeLog                                   |  32 ++
 VERSION.cmake                               |   2 +-
 bufrdc_wmo/buprt.F                          |  17 +-
 bufrdc_wmo/getflag.F                        |  19 +-
 bufrtables/.gitignore                       |   4 +
 bufrtables/B0000000000098023001.TXT         |   2 +-
 bufrtables/CMakeLists.txt                   |  10 +-
 bufrtables/VERSION.cmake                    |   2 +-
 bufrtables/bamboo/flags.cmake               |   2 +-
 bufrtables/links.sh                         |  21 +-
 cmake/FindAEC.cmake                         |   2 -
 cmake/FindArmadillo.cmake                   |  33 +-
 cmake/FindEMOS.cmake                        |   2 -
 cmake/FindLibIFort.cmake                    |  47 +++
 cmake/FindMKL.cmake                         |  77 ++++
 cmake/FindNetCDF.cmake                      | 145 ++++---
 cmake/FindNetCDF3.cmake                     |  65 ++--
 cmake/FindOpenCL.cmake                      |  67 ++++
 cmake/FindOpenJPEG.cmake                    |   3 +-
 cmake/FindPango.cmake                       |   2 -
 cmake/FindPangoCairo.cmake                  |  13 +-
 cmake/FindProj4.cmake                       |   2 -
 cmake/FindSZip.cmake                        |   2 -
 cmake/FindTrilinos.cmake                    |   3 -
 cmake/FindViennaCL.cmake                    |  38 ++
 cmake/Findgrib_api.cmake                    |   2 -
 cmake/Findodb_api.cmake                     |   2 -
 cmake/Findspot.cmake                        |   2 -
 cmake/VERSION.cmake                         |   4 +-
 cmake/contrib/FindEigen3.cmake              |  10 +-
 cmake/contrib/FindNetCDF4.cmake             |  14 +-
 cmake/ecbuild_add_executable.cmake          | 341 +++++++++--------
 cmake/ecbuild_add_extra_search_paths.cmake  |  31 +-
 cmake/ecbuild_add_library.cmake             | 572 ++++++++++++++--------------
 cmake/ecbuild_add_option.cmake              |  95 +++--
 cmake/ecbuild_add_persistent.cmake          |  65 ++--
 cmake/ecbuild_add_resources.cmake           |  50 ---
 cmake/ecbuild_add_test.cmake                | 482 ++++++++++++-----------
 cmake/ecbuild_append_to_rpath.cmake         |  10 +-
 cmake/ecbuild_bundle.cmake                  |  28 +-
 cmake/ecbuild_check_functions.cmake         |  61 +--
 cmake/ecbuild_debug_var.cmake               |  12 +
 cmake/ecbuild_define_build_types.cmake      |  19 +-
 cmake/ecbuild_define_uninstall.cmake        |   7 +
 cmake/ecbuild_dont_pack.cmake               |  60 +++
 cmake/ecbuild_download_resource.cmake       |  37 ++
 cmake/ecbuild_find_fortranlibs.cmake        | 189 ++++-----
 cmake/ecbuild_find_omp.cmake                |   8 +-
 cmake/ecbuild_find_package.cmake            | 337 +++++++++-------
 cmake/ecbuild_find_perl.cmake               |  48 +--
 cmake/ecbuild_find_python.cmake             |  33 +-
 cmake/ecbuild_get_test_data.cmake           |  32 +-
 cmake/ecbuild_install_package.cmake         |  69 ++--
 cmake/ecbuild_list_extra_search_paths.cmake |  13 +-
 cmake/ecbuild_log.cmake                     | 104 +++++
 cmake/ecbuild_policies.cmake                |  63 +++
 cmake/ecbuild_setup_test_framework.cmake    |  47 ++-
 cmake/ecbuild_system.cmake                  | 387 +++++++++----------
 cmake/ecbuild_uninstall.cmake.in            |  21 +
 cmake/ecbuild_use_package.cmake             | 270 +++++++------
 cmake/project-config.cmake.in               |   9 +-
 cmake/pymain.c                              |   5 +
 gribex/abortx.F                             |  78 ++--
 interpolation/CMakeLists.txt                |   4 +-
 interpolation/auresol.F                     |  25 +-
 interpolation/dpath_tables_interpol.F       | 129 +++++++
 interpolation/dpath_tables_interpol.F90     | 124 ------
 interpolation/forced_nearest_neighbour.F    |  60 +++
 interpolation/hirlam.F                      |  26 +-
 interpolation/hirlsm.F                      |  26 +-
 interpolation/hll2ll.F                      |  35 +-
 interpolation/hrg2gg.F                      |  34 +-
 interpolation/igtog.F                       |  40 +-
 interpolation/igtogr.F                      |  33 +-
 interpolation/intuvf.F                      |  21 +-
 interpolation/intuvph.F                     |  19 +-
 interpolation/irgtog.F                      |  42 +-
 interpolation/islproc.F                     |  31 +-
 interpolation/{jgglat.F => jbess.F}         | 221 +----------
 interpolation/jgglat.F                      | 186 +--------
 interpolation/kintrg.F                      |  37 +-
 interpolation/rename_unlink.c               |   8 +-
 pbio/emosnum.F                              |  15 +-
 tests/CMakeLists.txt                        | 112 +++++-
 tests/bufr_data_files.txt                   | 136 +++++++
 tests/bufr_demo.f90                         | 307 +++++++--------
 tests/{fft/fft.f => fft.F}                  |   7 +-
 tests/fft/Makefile                          |  26 --
 tests/fft/Makefile.in                       |  29 --
 tests/interpolation.F                       |   2 +-
 tools/bufrtools_wmo/bufr_decode_all.F       |  38 +-
 92 files changed, 3199 insertions(+), 2827 deletions(-)

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