This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository netcdf4-python.
commit 60ea6619c3f452c24769f9cfd427dff2c42e3f9b Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jul 31 22:09:18 2015 +0200 Revert HDF5 MPI changes. --- debian/changelog | 1 + debian/control | 1 - debian/patches/link-hdf5.patch | 43 ------------------------------------------ debian/patches/series | 1 - debian/rules | 9 ++------- 5 files changed, 3 insertions(+), 52 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9cccf7b..eed5631 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ netcdf4-python (1.1.9-2~exp2) UNRELEASED; urgency=medium * Bump minimum required libnetcdf-dev to 4.4.0~rc2-1~exp4 for serial HDF5. + * Revert HDF5 MPI changes. -- Bas Couwenberg <sebas...@debian.org> Fri, 31 Jul 2015 22:06:16 +0200 diff --git a/debian/control b/debian/control index 87e7f85..50eab40 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Build-Depends: debhelper (>= 9), cython, libhdf5-dev, libnetcdf-dev (>= 1:4.4.0~rc2-1~exp4), - mpi-default-dev, chrpath Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/netcdf4-python.git/ diff --git a/debian/patches/link-hdf5.patch b/debian/patches/link-hdf5.patch deleted file mode 100644 index 4127fe6..0000000 --- a/debian/patches/link-hdf5.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Append HDF5 paths to support MPI variant. -Author: Bas Couwenberg <sebas...@debian.org> - ---- a/setup.py -+++ b/setup.py -@@ -130,6 +130,9 @@ def getnetcdfvers(libdirs): - HDF5_dir = os.environ.get('HDF5_DIR') - HDF5_incdir = os.environ.get('HDF5_INCDIR') - HDF5_libdir = os.environ.get('HDF5_LIBDIR') -+MPI_dir = os.environ.get('MPI_DIR') -+MPI_incdir = os.environ.get('MPI_INCDIR') -+MPI_libdir = os.environ.get('MPI_LIBDIR') - netCDF4_dir = os.environ.get('NETCDF4_DIR') - netCDF4_incdir = os.environ.get('NETCDF4_INCDIR') - netCDF4_libdir = os.environ.get('NETCDF4_LIBDIR') -@@ -174,6 +177,12 @@ if USE_SETUPCFG and os.path.exists(setup - except: pass - try: HDF5_incdir = config.get("directories", "HDF5_incdir") - except: pass -+ try: MPI_dir = config.get("directories", "MPI_dir") -+ except: pass -+ try: MPI_libdir = config.get("directories", "MPI_libdir") -+ except: pass -+ try: MPI_incdir = config.get("directories", "MPI_incdir") -+ except: pass - try: netCDF4_dir = config.get("directories", "netCDF4_dir") - except: pass - try: netCDF4_libdir = config.get("directories", "netCDF4_libdir") -@@ -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'] -+ if HDF5_libdir: -+ lib_dirs.append(HDF5_libdir) -+ if HDF5_incdir: -+ inc_dirs.append(HDF5_incdir) -+ if MPI_libdir: -+ lib_dirs.append(MPI_libdir) -+ if MPI_incdir: -+ inc_dirs.append(MPI_incdir) - # if nc-config didn't work (it won't on windows), fall back on brute force method - else: - dirstosearch = [os.path.expanduser('~'),'/usr/local','/sw','/opt','/opt/local', '/usr'] diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9c8c4ee..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -link-hdf5.patch diff --git a/debian/rules b/debian/rules index 94f200b..36c47fc 100755 --- a/debian/rules +++ b/debian/rules @@ -4,13 +4,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -include /usr/share/mpi-default-dev/debian_defaults - -export HDF5_INCDIR=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) -export HDF5_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) - -export MPI_INCDIR=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include -export MPI_LIBDIR=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/lib +export HDF5_INCDIR=/usr/include/hdf5/serial +export HDF5_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial export USE_NCCONFIG=1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel