[netcdf4-python] 02/03: Move UNRELEASED changes to new experimental revision, refresh link-hdf5.patch.

[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 b552ac6051069b4b2021d699d2f9f630fc4b54a9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 31 01:27:47 2015 +0200

    Move UNRELEASED changes to new experimental revision, refresh link-hdf5.patch.
---
 debian/changelog               | 12 ++++++------
 debian/patches/link-hdf5.patch |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4fcffcf..bf03b29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+netcdf4-python (1.1.9-2~exp1) UNRELEASED; urgency=medium
+
+  * Use mpi-default-dev to select the architecture specific HDF5 MPI flavor.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 31 Jul 2015 01:24:14 +0200
+
 netcdf4-python (1.1.9-1) unstable; urgency=medium
 
   * New upstream release.
@@ -8,12 +14,6 @@ netcdf4-python (1.1.9-1) unstable; urgency=medium
 
  -- 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.
diff --git a/debian/patches/link-hdf5.patch b/debian/patches/link-hdf5.patch
index 6163e10..4127fe6 100644
--- a/debian/patches/link-hdf5.patch
+++ b/debian/patches/link-hdf5.patch
@@ -13,7 +13,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
  netCDF4_dir = os.environ.get('NETCDF4_DIR')
  netCDF4_incdir = os.environ.get('NETCDF4_INCDIR')
  netCDF4_libdir = os.environ.get('NETCDF4_LIBDIR')
-@@ -165,6 +168,12 @@ if os.path.exists(setup_cfg):
+@@ -174,6 +177,12 @@ if USE_SETUPCFG and os.path.exists(setup
      except: pass
      try: HDF5_incdir = config.get("directories", "HDF5_incdir")
      except: pass
@@ -26,7 +26,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
      try: netCDF4_dir = config.get("directories", "netCDF4_dir")
      except: pass
      try: netCDF4_libdir = config.get("directories", "netCDF4_libdir")
-@@ -235,6 +244,14 @@ if not retcode:
+@@ -244,6 +253,14 @@ if not retcode:
      lib_dirs = [str(l[2:].decode()) for l in dep.split() if l[0:2].decode() == '-L' ]
      dep=subprocess.Popen([ncconfig,'--cflags'],stdout=subprocess.PIPE).communicate()[0]
      inc_dirs = [str(i[2:].decode()) for i in dep.split() if i[0:2].decode() == '-I']

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