[netcdf4-python] 01/03: Merge branch 'master' into experimental

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository netcdf4-python.

commit 8a72527537ee752763b0cf5281139390da793aa2
Merge: ffae7f2 be8b5d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 31 01:24:07 2015 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 .travis.yml                             |     1 +
 Changelog                               |    23 +
 MANIFEST.in                             |     4 +
 README.gh-pages                         |    20 +-
 README.md                               |    16 +-
 README.wheels.md                        |   100 +
 create_docs.sh                          |     7 +-
 debian/changelog                        |    10 +
 debian/patches/cython-clean.patch       |    16 -
 debian/patches/fix-manpage-syntax.patch |    49 -
 debian/patches/no-online-tests.patch    |    19 -
 debian/patches/series                   |     3 -
 debian/upstream/metadata                |     2 +-
 debian/watch                            |     4 +-
 docs/api-objects.txt                    |   285 -
 docs/class-tree.html                    |   151 -
 docs/crarr.png                          |   Bin 340 -> 0 bytes
 docs/epydoc.css                         |   322 -
 docs/epydoc.js                          |   293 -
 docs/help.html                          |   272 -
 docs/identifier-index.html              |   698 --
 docs/index.html                         |  1732 ---
 docs/module-tree.html                   |   109 -
 docs/netCDF4-module.html                |  1660 ---
 docs/netCDF4.CompoundType-class.html    |   357 -
 docs/netCDF4.Dataset-class.html         |  1705 ---
 docs/netCDF4.Dimension-class.html       |   394 -
 docs/netCDF4.Group-class.html           |   387 -
 docs/netCDF4.MFDataset-class.html       |   528 -
 docs/netCDF4.MFTime-class.html          |   307 -
 docs/netCDF4.VLType-class.html          |   344 -
 docs/netCDF4.Variable-class.html        |  1464 ---
 docs/netCDF4/index.html                 |  5584 +++++++++
 docs/redirect.html                      |    38 -
 man/nc3tonc4.1                          |    18 +-
 man/nc4tonc3.1                          |     6 +-
 netCDF4/__init__.py                     |     8 +-
 netCDF4/_netCDF4.c                      | 18150 ++++++++++++++++--------------
 netCDF4/_netCDF4.pyx                    |  2593 +++--
 netcdftime/_datetime.c                  |   482 +-
 netcdftime/_datetime.pyx                |     7 +
 netcdftime/netcdftime.py                |    29 +-
 setup.py                                |    23 +-
 test/run_all.py                         |     5 +
 test/tst_netcdftime.py                  |    31 +-
 test/tst_scaled.py                      |    45 +
 test/tst_slicing.py                     |    12 +
 47 files changed, 17016 insertions(+), 21297 deletions(-)

diff --cc debian/changelog
index d5df534,e6a3f06..4fcffcf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,13 +1,38 @@@
+ netcdf4-python (1.1.9-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches, applied upstream.
+   * Update watch file, changes:
+     - Force lowercase RC in uversionmangle
+     - Handle other tar extensions in filenamemangle
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 31 Jul 2015 01:17:52 +0200
+ 
 +netcdf4-python (1.1.8-3~exp4) UNRELEASED; urgency=medium
 +
 +  * Use mpi-default-dev to select the architecture specific HDF5 MPI flavor.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 30 Jul 2015 20:31:45 +0200
 +
 +netcdf4-python (1.1.8-3~exp3) experimental; urgency=medium
 +
 +  * Use HDF5 mpich variant on s390x.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 29 Jul 2015 20:29:31 +0200
 +
 +netcdf4-python (1.1.8-3~exp2) experimental; urgency=medium
 +
 +  * Require at least libnetcdf-dev 4.3.3.1 for HDF5 openmpi variant.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 29 Jul 2015 12:04:55 +0200
 +
 +netcdf4-python (1.1.8-3~exp1) experimental; urgency=medium
 +
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +  * Add patch to support HDF5 openmpi variant used to build netcdf.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 28 Jul 2015 23:25:21 +0200
 +
  netcdf4-python (1.1.8-2) unstable; urgency=medium
  
    * Override dh_auto_test to ignore test failures.
diff --cc debian/patches/series
index cc41ecf,0000000..9c8c4ee
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,1 @@@
- cython-clean.patch
- no-online-tests.patch
- fix-manpage-syntax.patch
 +link-hdf5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git