[emos] 05/12: Merge tag 'upstream/4.4.1' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon May 30 11:29:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository emos.
commit d584ebd3298ffb6dc01f56dd89dd3be0a94c389f
Merge: ab68192 5e90bd1
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun May 1 02:03:11 2016 +0100
Merge tag 'upstream/4.4.1' into debian/master
CMakeLists.txt | 3 +-
ChangeLog | 27 +-
VERSION.cmake | 2 +-
bamboo/INTEL-env.sh | 3 +
bin/CMakeLists.txt | 4 +-
bufrtables/CMakeLists.txt | 4 +-
bufrtables/links.sh | 14092 +++++++++----------
cmake/CheckFortranSourceCompiles.cmake | 8 +-
cmake/FindArmadillo.cmake | 5 +-
cmake/FindCMath.cmake | 13 +-
cmake/FindCairo.cmake | 5 +-
cmake/FindDl.cmake | 5 +-
cmake/FindGeoTIFF.cmake | 5 +-
cmake/FindLegacyFDB.cmake | 35 -
cmake/FindLibGFortran.cmake | 7 +-
cmake/FindLibIFort.cmake | 5 +-
cmake/FindNetCDF3.cmake | 5 +-
cmake/FindOpenCL.cmake | 5 +-
cmake/FindPGIFortran.cmake | 9 +-
cmake/FindPango.cmake | 6 +-
cmake/FindPangoCairo.cmake | 18 +-
cmake/FindProj4.cmake | 2 +-
cmake/FindRealtime.cmake | 6 +-
cmake/FindViennaCL.cmake | 5 +-
cmake/FindXLFortranLibs.cmake | 6 +-
cmake/VERSION.cmake | 4 +-
cmake/contrib/FindNetCDF4.cmake | 29 +-
cmake/ecbuild_add_c_flags.cmake | 2 +-
cmake/ecbuild_add_cxx_flags.cmake | 2 +-
cmake/ecbuild_add_executable.cmake | 6 +-
cmake/ecbuild_add_fortran_flags.cmake | 2 +-
cmake/ecbuild_add_library.cmake | 10 +-
cmake/ecbuild_add_option.cmake | 20 +-
cmake/ecbuild_add_persistent.cmake | 6 +-
cmake/ecbuild_add_resources.cmake | 4 +-
cmake/ecbuild_add_test.cmake | 50 +-
cmake/ecbuild_append_to_rpath.cmake | 2 +-
cmake/ecbuild_bundle.cmake | 6 +-
cmake/ecbuild_check_c_source_return.cmake | 10 +-
cmake/ecbuild_check_cxx11.cmake | 15 +-
cmake/ecbuild_check_cxx_source_return.cmake | 14 +-
cmake/ecbuild_check_fortran_source_return.cmake | 12 +-
cmake/ecbuild_check_os.cmake | 44 +-
cmake/ecbuild_declare_project.cmake | 10 +-
cmake/ecbuild_define_build_types.cmake | 2 +-
cmake/ecbuild_dont_pack.cmake | 4 +-
cmake/ecbuild_download_resource.cmake | 4 +-
cmake/ecbuild_echo_targets.cmake | 16 +-
cmake/ecbuild_enable_fortran.cmake | 4 +-
cmake/ecbuild_features.cmake | 2 +-
cmake/ecbuild_find_fortranlibs.cmake | 12 +-
cmake/ecbuild_find_mpi.cmake | 12 +-
cmake/ecbuild_find_omp.cmake | 2 +-
cmake/ecbuild_find_package.cmake | 28 +-
cmake/ecbuild_find_perl.cmake | 4 +-
cmake/ecbuild_find_python.cmake | 6 +-
cmake/ecbuild_generate_config_headers.cmake | 2 +-
cmake/ecbuild_generate_fortran_interfaces.cmake | 52 +-
cmake/ecbuild_generate_rpc.cmake | 8 +-
cmake/ecbuild_generate_yy.cmake | 10 +-
cmake/ecbuild_get_cxx11_flags.cmake | 2 +-
cmake/ecbuild_get_date.cmake | 4 +-
cmake/ecbuild_get_resources.cmake | 4 +-
cmake/ecbuild_get_test_data.cmake | 18 +-
cmake/ecbuild_git.cmake | 49 +-
cmake/ecbuild_install_project.cmake | 6 +-
cmake/ecbuild_list_exclude_pattern.cmake | 6 +-
cmake/ecbuild_log.cmake | 129 +-
cmake/ecbuild_pkgconfig.cmake | 4 +-
cmake/ecbuild_print_summary.cmake | 58 +-
cmake/ecbuild_project_files.cmake | 2 +-
cmake/ecbuild_requires_macro_version.cmake | 2 +-
cmake/ecbuild_separate_sources.cmake | 6 +-
cmake/ecbuild_setup_test_framework.cmake | 6 +-
cmake/ecbuild_system.cmake | 18 +-
cmake/ecbuild_use_package.cmake | 14 +-
cmake/ecbuild_warn_unused_files.cmake | 26 +-
cmake/fcm-make-interfaces.cfg | 31 +
debian/changelog | 6 +
interpolation/0-INDEX-0 | 1 -
interpolation/CMakeLists.txt | 1 -
interpolation/describe_input_field.c | 294 +-
interpolation/estima.F | 21 +-
interpolation/estima_reg.F | 23 -
interpolation/intfbu.F | 10 +-
interpolation/jopnggsm.c | 10 +
interpolation/jopnllsm.c | 10 +
interpolation/wavexx2.F | 49 +-
pbio/emosnum.F | 2 +-
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 11 +
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 11 +
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 25 +-
tests/CMakeLists.txt | 24 +-
tests/bufr/CMakeLists.txt | 74 +-
tests/bufr/regress/CMakeLists.txt | 17 +
.../download_tests_bufr_src_files.txt | 0
tests/regress/CMakeLists.txt | 88 +-
tests/regress/download_tests_regress_ref_files.txt | 9 +
tests/regress/download_tests_regress_src_files.txt | 2 +
tools/int.F | 183 +-
100 files changed, 8158 insertions(+), 7799 deletions(-)
diff --cc debian/changelog
index 1ad8ddd,0000000..edc8141
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,325 -1,0 +1,331 @@@
++emoslib (2:4.4.1-1) UNRELEASED; urgency=medium
++
++ * New upstream release.
++
++ -- Alastair McKinstry <mckinstry at debian.org> Sun, 01 May 2016 02:03:21 +0100
++
+emoslib (2:4.3.9-2) unstable; urgency=medium
+
+ * Set mcmodel=medany for sparc64.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 25 Mar 2016 10:48:07 +0000
+
+emoslib (2:4.3.9-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Add missing *.distinct files to bufrtables. Closes: #799854
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 22 Mar 2016 20:24:00 +0000
+
+emoslib (2:4.3.7-2) unstable; urgency=medium
+
+ * Drop dependency on Jasper. Latest grib-api no longer uses it;
+ jasper is being dropped from Debian in favour of openjpeg, as it is
+ obsolete and unsupported.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 02 Mar 2016 07:17:03 +0000
+
+emoslib (2:4.3.7-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS on sparc64. Closes: #813649.
+ - Set mcmodel=medany in debian/rules.
+ - Add sparc64 to FPIC_LIST in debian/rules.
+ * Remove trailing spaces in debian/changelog.
+ * Wrap lines longer than 80 columns in debian/changelog.
+
+ -- John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de> Mon, 08 Feb 2016 09:46:14 +0100
+
+emoslib (2:4.3.7-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use -fPIC on m68k. Closes: #810389.
+ * Standards-Version: 3.9.7. No changes required.
+ * FFTW3 now required by EMOSLIB.
+ * Set mcmodel=large for sparc64. Closes: #813649.
+ * Ack, previously fixed symlink bug: Closes: #799854.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 04 Feb 2016 13:04:39 +0000
+
+emoslib (2:4.3.3-2) unstable; urgency=medium
+
+ * Change libpng12-dev to libpng-dev for png16 transition. Closes: #810168.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 07 Jan 2016 17:11:03 +0000
+
+emoslib (2:4.3.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ Provides new octahedral Gauss. grid support.
+ * Refreshed patches. huge.patch, wvqlid2.patch no longer needed.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 04 Jan 2016 03:39:28 +0000
+
+emoslib (2:4.1.1-6) unstable; urgency=medium
+
+ * Use -fPIC building on s390x to resolve GOT linking errors.
+ * Link "--as-needed".
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 06 Nov 2015 19:12:20 +0000
+
+emoslib (2:4.1.1-5) unstable; urgency=medium
+
+ * Add s390x to the list of archs on which we disable tests.
+ * Set INTERPOL_TABLES_PATH during build to be install location.
+ * Set libemos-bin as MultiArch: allowed, with libemos-dev depend on
+ libemos-bin:any
+ * Fix interpol links in libemos-data to be relative.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 28 Oct 2015 13:17:32 +0000
+
+emoslib (2:4.1.1-4) unstable; urgency=medium
+
+ * Disable tests for big-endian systems (being worked on upstream).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 28 Oct 2015 03:05:01 +0000
+
+emoslib (2:4.1.1-3) experimental; urgency=medium
+
+ * Disable download of bufr tests.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 27 Oct 2015 16:06:30 +0000
+
+emoslib (2:4.1.1-2) experimental; urgency=medium
+
+ * Change /usr/lib/*/cmake/Emos -> /usr/lib/*/cmake/libemos
+ * libemos-dev now depends on libemos-bin as cmake configs
+ assume binaries are available.
+ * Now need libboost-test-dev optional package.
+ * Re-enable tests.
+ * Fixup libemos-dev cmake files for metview to compile.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 24 Oct 2015 20:58:07 +0100
+
+emoslib (2:4.1.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 21 Oct 2015 12:38:35 +0100
+
+emoslib (2:4.0.7-4) unstable; urgency=medium
+
+ * Build fix for SIGN() real type problem on kFreeBSD in csect4.F.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 15 Aug 2015 17:09:48 +0100
+
+emoslib (2:4.0.7-3) unstable; urgency=medium
+
+ * Disable tests to allow emos to proceed for gcc5 transition;
+ working on the issue (see #793955) with upstream;
+ code in question is obsolete and being removed.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 07 Aug 2015 19:23:44 +0100
+
+emoslib (2:4.0.7-2) experimental; urgency=medium
+
+ * Enable tests.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 26 Jul 2015 13:38:30 +0100
+
+emoslib (2:4.0.7-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 16 Jul 2015 09:02:02 +0100
+
+emoslib (2:4.0.3+dfsg.1-4) unstable; urgency=medium
+
+ * ppc64el build needs both -fpic and -mcmodel=large. Closes: #790078.
+ * Need to add build_fixes.patch to ensure __GNU__ set properly for Hurd.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 12 Jul 2015 16:58:16 +0100
+
+emoslib (2:4.0.3+dfsg.1-3) unstable; urgency=medium
+
+ * drop_tune.patch: Drop -mtune=native which breaks s390x port.
+ * Don't set -mcmodel=large on arm64, as large+fpic doesn't work.
+ * Homepage fixed. Closes: #769179.
+ * Build ppc64el, sparc -fPIC not fpic.
+ * Build fix for Hurd-i386: Add ifdef __GNU__ case.
+ * Install cmake module in arch-dependent dir. Closes: #790344.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 09 Jul 2015 07:44:50 +0100
+
+emoslib (2:4.0.3+dfsg.1-2) unstable; urgency=medium
+
+ * Remove rpath from shlibs. B-D on chrpath.
+ * Fix sed rules that broke some symlinks.
+ * Add bufrnum back to shlib in new cmake-build system.
+ * Change Vcs-Git url to canonical anonscm form.
+ * Use mcmodel=medium on amd64,ppc64; =large on arm64, drop it elsewhere.
+ Closes: #790077, #790078.
+ * Set DISABLE_OS_CHECK=ON to build on Hurd, KFreeBSD again.
+ Closes: #790079.
+ * Dedup. libemos-data stuff in interpol, land_sea_mask.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 27 Jun 2015 12:33:00 +0100
+
+emoslib (2:4.0.3+dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Change epoch as version format changes 000392 -> 4.0.3.
+ * Standards-Version: 3.9.6.
+ * Switch to cmake-based buildsystem. Lots more dependencies and code.
+ * Add libemos-bin package for new binaries (bufr_*, others).
+ * examples/ directory removed.
+ * Add Vcs-Git: debian-science to debian/control.
+ * Build-dependencies: grib-api > 1.9.16, libgrib-api-tools.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 21 Jun 2015 20:55:05 +0100
+
+emoslib (000392+dfsg.1-3) unstable; urgency=medium
+
+ * Acknowledge previously fixed bug (new version): Closes: #622860.
+ * Delete link to non-existent config.h file. Closes: #742684.
+ * Compress with xz.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 14 Sep 2014 07:01:40 +0100
+
+emoslib (000392+dfsg.1-2) unstable; urgency=medium
+
+ * Standards-Version: 3.9.5
+ * Include grib_api_merging/* into libemos* for MetView.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 12 Dec 2013 19:32:19 +0000
+
+emoslib (000392+dfsg.1-1) unstable; urgency=low
+
+ * New upstream release. Now with Apache 2.0 license, not GPL.
+ * Standards-Version: 3.9.4; no changes required.
+ * debhelper depends >=9 now.
+ * Make -dev pkg multiarch: same, -data is m-a: foreign. Closes: #693599.
+ * Enable hardening in shared library; build all objects fortified.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 05 Apr 2013 05:25:57 +0100
+
+emoslib (000382+dfsg-2) unstable; urgency=low
+
+ * Don't hardcode quadmath; it breaks on some archs. Instead let it be
+ pulled in by -lgfortran.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 11 Dec 2011 14:33:21 +0000
+
+emoslib (000382+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Nove from cdbs to debhelper 9
+ * Move to Multi-Arch.
+ * Standards-Version: 3.9.2
+ * Now build-depend on grib-api-1.9.9.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 09 Dec 2011 16:18:04 +0000
+
+emoslib (000380+dfsg-3) unstable; urgency=low
+
+ * Fix for FTBFS on powerpc due to hard-coded max value.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 30 Mar 2010 10:21:14 +0100
+
+emoslib (000380+dfsg-2) unstable; urgency=low
+
+ * Move to Standards-Version: 3.8.4; no changes required.
+ * Disable new function WVQLID2 in interpolation/ ; it requires an
+ external function that is not present, and causes the sharedlib
+ not to link. Closes: #571396.
+ * Add DEP-3 tags to patches.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 26 Feb 2010 13:59:04 +0000
+
+emoslib (000380+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * remove_sharedllib_dbg patch now needed. Added file sharedlib.c to
+ interpolation/sources.linux.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 21 Jan 2010 13:57:20 +0000
+
+emoslib (000371+dfsg-3) unstable; urgency=low
+
+ * Remove quilt rule, which conflicts with source format 3. Closes: #561382.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 17 Dec 2009 21:31:05 +0000
+
+emoslib (000371+dfsg-2) unstable; urgency=low
+
+ * Fix broken patch that lead to non-shared code. Closes: #559944.
+ * Source format 3.0
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 08 Dec 2009 13:38:29 +0000
+
+emoslib (000371+dfsg-1) unstable; urgency=low
+
+ * New upstream release: EMOS_00371.
+ * Move to standards: 3.8.3.
+ * Patch largefile.patch needed for new sharedlib.c bug in 000371.
+ * Add underscore_names patch to add file to sources.linux in interpolation/.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 07 Dec 2009 20:26:14 +0000
+
+emoslib (000370.dfsg.2-1) unstable; urgency=low
+
+ * Updated version emos_000370 contains the following fixes:
+ Latest Emos library 000370 is updated on 7.9.2009 due to
+ changes of N320 Reduced Gaussian Grid definition.
+
+ Beside of N320 there are two more changes:
+ - insane.F : Set env variable INCREMENT_NO_LIMIT=1 to
+ avoid check of limit for increment size
+ - wavexxx.F: Bug Fix for calculation of latitudes.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 14 Sep 2009 15:36:35 +0100
+
+emoslib (000370+dfsg-6) unstable; urgency=low
+
+ * Move to Standards-Version: 3.8.2. No changes required.
+ * DH_COMPAT=7 now. ditto.
+ * Prep. for building with source format 3.0. Closes: #538678.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 04 Aug 2009 16:30:25 +0100
+
+emoslib (000370+dfsg-5) unstable; urgency=low
+
+ * Add Build-Depends: automake. Text with pbuilder. Closes: #529993.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 22 May 2009 21:39:32 +0100
+
+emoslib (000370+dfsg-4) unstable; urgency=low
+
+ * Change -fpic to -fPIC to fix breakage on sparc and other arches.
+ * Add little_endian.patch : use configure to detect endianness during build.
+ As a side-effect it adds GNU targets such as ChangeLog: I've added some
+ content from the ECMWF website.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 21 May 2009 20:31:30 +0100
+
+emoslib (000370+dfsg-3) unstable; urgency=low
+
+ * Remove -m32 compiler flag which causes build failures on most architectures.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 20 May 2009 22:16:53 +0100
+
+emoslib (000370+dfsg-2) unstable; urgency=low
+
+ * Add dependency on gfortran.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 19 May 2009 12:12:06 +0100
+
+emoslib (000370+dfsg-1) unstable; urgency=low
+
+ * New upstream release. Closes: #522755.
+ * Remove pdf documentation for dfsg release.
+ * Rename (unreleased) package names libemos0d to reflect its a Debian-only
+ shared-library at the moment
+ (see http://lists.debian.org/debian-devel/2009/03/msg01019.html).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 16 May 2009 23:32:19 +0100
+
+emoslib (000360-1) unstable; urgency=low
+
+ * Initial Debian release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 9 Apr 2009 16:15:52 +0100
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git
More information about the debian-science-commits
mailing list