[cmor] 08/12: Merge upstream/2.9.3
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Aug 8 08:05:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit d66eee74c2f5717027d5c2f436a94bf2ac562208
Merge: 66d69a6 9ccbe9a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 13 11:07:00 2016 +0100
Merge upstream/2.9.3
INSTALL | 27 +++--
Lib/__init__.py | 3 +-
Makefile.in | 5 +-
Src/cmor.c | 71 +++++++++++++-
Src/cmor_axes.c | 8 +-
Src/cmor_grids.c | 1 +
Src/cmor_md5.c | 2 +-
Src/cmor_tables.c | 4 +
Test/test_non_monotonic_climo_bonds_ok.py | 54 ++++++++++
Test/test_python_2Gb_slice.py | 8 +-
Test/test_python_free_wrapping_issue.py | 157 ++++++++++++++++++++++++++++++
configure | 4 +-
configure.ac | 4 +-
debian/changelog | 6 --
debian/control | 2 +-
include/cmor.h | 7 +-
16 files changed, 331 insertions(+), 32 deletions(-)
diff --cc debian/changelog
index 83d06e4,0000000..8b9e72e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,262 -1,0 +1,256 @@@
- cmor (2.9.1-8) UNRELEASED; urgency=medium
-
- * Standards-Version: 3.9.8
-
- -- Alastair McKinstry <mckinstry at debian.org> Thu, 12 May 2016 16:22:18 +0100
-
+cmor (2.9.1-7) unstable; urgency=medium
+
+ * Now recommend cmor-tables instead of cmip5-cmor-tables.
+ * Standards-Version: 3.9.7
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 03 Apr 2016 14:58:19 +0100
+
+cmor (2.9.1-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Require at least libnetcdf-dev 4.3.3.1 for netcdf transition.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 19 Aug 2015 21:04:08 +0200
+
+cmor (2.9.1-6) experimental; urgency=medium
+
+ * test against netcdf 4.4.2 for transition.
+ * Standards-Version: 3.9.6.
+ * Update home page
+ * Add Vcs-Git pointing to debian-science URL
+ * Removing ppc64el workaround; apparently problem fixed. Closes: #768136.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 15 Jul 2015 09:01:48 +0100
+
+cmor (2.9.1-5) unstable; urgency=medium
+
+ * Fix typo that used wrong var name on conditional ppc64el build
+ in debian/rules. Thanks to pini. Closes: #755167.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 28 Jul 2014 10:18:06 +0100
+
+cmor (2.9.1-4) unstable; urgency=medium
+
+ * Make additional flags and pkgs a requirement for ppc64el only.
+ Closes: #755167, #754640.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 24 Jul 2014 19:05:11 +0100
+
+cmor (2.9.1-3) unstable; urgency=medium
+
+ * Add patch for ppc64el. Needs krb, gssapi and friends. Closes: #748947.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 11 Jul 2014 10:09:09 +0100
+
+cmor (2.9.1-2) unstable; urgency=medium
+
+ * Disable known broken tests on kfreebsd, s390x to allow transition.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 09 Jul 2014 11:51:45 +0100
+
+cmor (2.9.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 24 Jun 2014 12:00:26 +0100
+
+cmor (2.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Depend on debhelper >=9 now. Remove lintian override.
+ * Enable hardening.
+ * Enable build-twice.
+ * Standards-Version: 3.9.5
+ * Build-Conflict: on python packages. For correct testing.
+ * Use xz compression.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 31 May 2014 18:19:02 +0100
+
+cmor (2.8.0-3) unstable; urgency=low
+
+ * Drop reference to upstream git repo for now. Closes: #661325
+ * Fix broken symlink libcmor.so. Closes: #681891
+ * Don't run test suite on kfreebsd-i386 as the buildds typically don't
+ have DFLSIZ set high enough. Closes: #598745.
+ * Standards-Version: 3.9.3
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 09 Sep 2012 13:56:03 +0100
+
+cmor (2.8.0-2) unstable; urgency=low
+
+ * Add lintian override for DH 9 without versioned depends.
+ * Remove libcmor2.install that adds incorrect double copy of library.
+ Closes: #650387.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 04 Feb 2012 16:33:01 +0000
+
+cmor (2.8.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 27 Nov 2011 14:35:02 +0000
+
+cmor (2.7.1-4) unstable; urgency=low
+
+ * Add Multiarch support.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 01 Oct 2011 13:24:48 +0100
+
+cmor (2.7.1-3) unstable; urgency=low
+
+ * Add dh_numpy call to get versioned depends on numpy. Closes: #641791.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 16 Sep 2011 14:03:07 +0100
+
+cmor (2.7.1-2) unstable; urgency=low
+
+ * Use python2 instead of python-central (and python-support)
+ Closes: #616778.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 16 Sep 2011 14:03:07 +0100
+
+cmor (2.7.1-1) unstable; urgency=low
+
+ * New upstream release. (Minor debugging statements removed).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 03 Jul 2011 18:24:50 +0100
+
+cmor (2.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 21 Jun 2011 17:00:17 +0100
+
+cmor (2.6.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 14 Jun 2011 10:39:10 +0100
+
+cmor (2.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 07 Jun 2011 09:36:53 +0100
+
+cmor (2.5.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Recommend latest cmip5 tables. (1.3.9).
+ * Standards-Version : 3.9.2
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 28 Apr 2011 10:19:48 +0100
+
+cmor (2.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 12 Apr 2011 09:41:12 +0100
+
+cmor (2.5.7-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 25 Feb 2011 23:24:49 +0000
+
+cmor (2.5.5-1) unstable; urgency=low
+
+ * New upstream release, fixing MPI issue.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 17 Feb 2011 09:33:18 +0000
+
+cmor (2.5.4-1) unstable; urgency=low
+
+ * New upstream release, fixing memory issue in python module.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 03 Feb 2011 15:42:41 +0000
+
+cmor (2.5.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add Recommends: cmip5-cmor-tables to libcmor2
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 01 Feb 2011 09:51:35 +0000
+
+cmor (2.5.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 24 Dec 2010 15:17:40 +0000
+
+cmor (2.5.1-2) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Fix build failure with ld --no-add-needed. Closes: #606210.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 07 Dec 2010 19:23:17 +0000
+
+cmor (2.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added debug-test.patch to help debug FTFBS on s390, kfreebsd-*
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 05 Dec 2010 15:16:25 +0000
+
+cmor (2.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 13 Nov 2010 15:15:27 +0000
+
+cmor (2.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Minor patch to ensure Tables is created for tests to run.
+ * Build-Conflict: libcmor2. Package may fail to build in strange ways if
+ a pre-existing version of the library is present.
+ * Update Git server; its moved.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 29 Oct 2010 07:20:46 +0100
+
+cmor (2.3.0-2) unstable; urgency=low
+
+ * --enable-netcdf-4 not a valid option; remove. Just use autodetection.
+ * libcmor.so.2 should be linked against -lossp-uuid;
+ * Add -I${includedir}/cdTime to CFlags in cmor.pc
+ * Add FFlags variable to cmor.pc for Fortran.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 12 Oct 2010 00:24:35 +0100
+
+cmor (2.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 08 Oct 2010 06:28:20 +0100
+
+cmor (2.2.1-1) unstable; urgency=low
+
+ * New Upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 17 Sep 2010 14:20:15 +0100
+
+cmor (2.2.0-2) unstable; urgency=low
+
+ * Include automake dependency; autoconf not needed. Closes: #592097.
+ * gfortran, python-numpy b-deps needed for python functionality.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 31 Aug 2010 18:40:03 +0100
+
+cmor (2.2.0-1) unstable; urgency=low
+
+ * Upstream release 2.2.0.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 25 Aug 2010 19:16:37 +0100
+
+cmor (2.0~rc10-2) unstable; urgency=low
+
+ * Add autoconf as build-dependency. Closes: #591932.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 06 Aug 2010 18:05:36 +0100
+
+cmor (2.0~rc10-1) unstable; urgency=low
+
+ * Initial release. (Closes: #584636).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 29 Jul 2010 10:50:58 +0100
diff --cc debian/control
index c45ec86,0000000..aaabb98
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,55 -1,0 +1,55 @@@
+Source: cmor
+Section: utils
+Priority: extra
+Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev,
+ libudunits2-dev, libnetcdf-dev, uuid-dev,
+ python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), python-numpy,
+ libgfortran3, automake, gfortran, pkg-config,
+ libhdf5-serial-dev | libhdf5-dev,
+Build-Conflicts: libcmor2, python-cmor, python3-cmor
- Standards-Version: 3.9.8
++Standards-Version: 3.9.7
+X-Python-Version: >= 2.6
+Homepage: https://pcmdi.github.io/cmor-site/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cmor.git
+
+Package: libcmor2
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: cmor-tables
+Description: Climate Model Output Rewriter library
+ The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour")
+ comprises a set of C-based functions, with bindings to both Python
+ and FORTRAN 90, that can be used to produce CF-compliant netCDF files
+ that fulfill the requirements of many of the climate community's
+ standard model experiments. These experiments are collectively
+ referred to as MIP's and include, for example, AMIP, CMIP, CFMIP,
+ PMIP, APE, and IPCC scenario runs. The output resulting from CMOR
+ is "self-describing" and facilitates analysis of results across models.
+
+Package: libcmor-dev
+Section: libdevel
+Architecture: any
+Depends: libcmor2 ( = ${binary:Version}), ${misc:Depends}
+Recommends: pkg-config
+Description: Development files for Climate Model Output Rewriter
+ The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour")
+ comprises a set of C-based functions, with bindings to both Python
+ and FORTRAN 90, that can be used to produce CF-compliant netCDF files.
+ that fulfill the requirements of many of the climate community's
+ standard model experiments.
+ .
+ This package contains files needed to build and link against the CMOR library.
+
+Package: python-cmor
+Section: python
+Architecture: any
+Multi-Arch: foreign
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Description: Python interface to CMOR
+ This is a Python interface to CMOR, the Climate Model Output Rewriter.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list