[DebianGIS-dev] r2389 - in packages/hdf5/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Aug 7 15:32:18 UTC 2009
Author: frankie
Date: 2009-08-07 15:32:18 +0000 (Fri, 07 Aug 2009)
New Revision: 2389
Added:
packages/hdf5/trunk/debian/patches/mpi.diff
Modified:
packages/hdf5/trunk/debian/changelog
packages/hdf5/trunk/debian/control
packages/hdf5/trunk/debian/control.in
packages/hdf5/trunk/debian/patches/series
packages/hdf5/trunk/debian/rules
Log:
Modified: packages/hdf5/trunk/debian/changelog
===================================================================
--- packages/hdf5/trunk/debian/changelog 2009-07-28 15:58:25 UTC (rev 2388)
+++ packages/hdf5/trunk/debian/changelog 2009-08-07 15:32:18 UTC (rev 2389)
@@ -1,3 +1,17 @@
+hdf5 (1.8.3-2) unstable; urgency=low
+
+ * Uploaded to unstable.
+ (closes: #519575, #501564, #470159)
+ * Fixed shlibs.in to avoid wrong interdependencies.
+ (closes: #537413)
+ * Added libjpeg-dev as an alternative build-dep and replaced
+ into the -dev package list of deps.
+ * [PATCH] mpi.diff added to remove mpio.h including, which
+ is supefluous for LAM, MPICH and OpenMPI AFAIK.
+ (closes: #515579)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 06 Aug 2009 16:40:50 +0200
+
hdf5 (1.8.3-1) experimental; urgency=low
* New upstream release.
Modified: packages/hdf5/trunk/debian/control
===================================================================
--- packages/hdf5/trunk/debian/control 2009-07-28 15:58:25 UTC (rev 2388)
+++ packages/hdf5/trunk/debian/control 2009-08-07 15:32:18 UTC (rev 2389)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
- libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev, debhelper (>> 7), sed (>=4.1.5), gfortran,
- libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
+ libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5),
+ gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
Standards-Version: 3.8.1
Homepage: http://hdfgroup.org/HDF5/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -28,7 +28,7 @@
Package: libhdf5-serial-dev
Section: libdevel
Architecture: any
-Depends: libhdf5-serial-1.8.3 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev
+Depends: libhdf5-serial-1.8.3 (= ${binary:Version}), zlib1g-dev, libjpeg-dev
Conflicts: libhdf5-dev
Provides: libhdf5-dev
Suggests: libhdf5-doc
Modified: packages/hdf5/trunk/debian/control.in
===================================================================
--- packages/hdf5/trunk/debian/control.in 2009-07-28 15:58:25 UTC (rev 2388)
+++ packages/hdf5/trunk/debian/control.in 2009-08-07 15:32:18 UTC (rev 2389)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
- libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev, debhelper (>> 7), sed (>=4.1.5), gfortran,
- libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
+ libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5),
+ gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
Standards-Version: 3.8.1
Homepage: http://hdfgroup.org/HDF5/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -28,7 +28,7 @@
Package: libhdf5-serial-dev
Section: libdevel
Architecture: any
-Depends: libhdf5-serial- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev
+Depends: libhdf5-serial- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev
Conflicts: libhdf5-dev
Provides: libhdf5-dev
Suggests: libhdf5-doc
Added: packages/hdf5/trunk/debian/patches/mpi.diff
===================================================================
--- packages/hdf5/trunk/debian/patches/mpi.diff (rev 0)
+++ packages/hdf5/trunk/debian/patches/mpi.diff 2009-08-07 15:32:18 UTC (rev 2389)
@@ -0,0 +1,14 @@
+Index: hdf5-1.8.3/src/H5public.h
+===================================================================
+--- hdf5-1.8.3.orig/src/H5public.h 2009-08-06 16:37:19.000000000 +0200
++++ hdf5-1.8.3/src/H5public.h 2009-08-06 16:37:51.000000000 +0200
+@@ -55,9 +55,6 @@
+ #endif
+ #ifdef H5_HAVE_PARALLEL
+ # include <mpi.h>
+-#ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
+-# include <mpio.h>
+-#endif
+ #endif
+
+
Modified: packages/hdf5/trunk/debian/patches/series
===================================================================
--- packages/hdf5/trunk/debian/patches/series 2009-07-28 15:58:25 UTC (rev 2388)
+++ packages/hdf5/trunk/debian/patches/series 2009-08-07 15:32:18 UTC (rev 2389)
@@ -1 +1,2 @@
autotools.diff -p1
+mpi.diff
Modified: packages/hdf5/trunk/debian/rules
===================================================================
--- packages/hdf5/trunk/debian/rules 2009-07-28 15:58:25 UTC (rev 2388)
+++ packages/hdf5/trunk/debian/rules 2009-08-07 15:32:18 UTC (rev 2389)
@@ -249,14 +249,14 @@
dh_strip $(ARCH_FLAG)
dh_compress $(ARCH_FLAG)
dh_fixperms $(ARCH_FLAG)
-# dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
+ dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
dh_makeshlibs -p$(lampack) -V $(lampack)
ifeq ($(build_openmpi),yes)
dh_makeshlibs -p$(openmpipack) -V $(openmpipack)
endif
dh_makeshlibs -p$(mpichpack) -V $(mpichpack)
dh_installdeb $(ARCH_FLAG)
- dh_shlibdeps -phdf5-tools -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
+ dh_shlibdeps -phdf5-tools -Lhdf5-tools -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
dh_shlibdeps -p$(serpack) -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
dh_shlibdeps -p$(lampack) -L$(lampack) -ldebian/$(lampack)/usr/lib
ifeq ($(build_openmpi),yes)
More information about the Pkg-grass-devel
mailing list