tags 510057 +patch
thanks

Hello Francesco,

On Wed, 2010-01-27 at 14:28 -0500, Adam C Powell IV wrote:
> On Wed, 2010-01-27 at 20:10 +0100, Francesco P. Lovergine wrote:
> > That said, a patch for add mpi-defaults to current support 
> > is of course welcome.
> 
> Okay, I will put some time into this approach (adding mpi-defaults,
> leaving the three in place) when I get some time, probably next week.

I'm attaching a patch vs. current SVN which adds an extra package
libhdf5-mpi-dev, that package is empty and depends on the default MPI
version of libhdf5-*-dev for each platform.  It has to be Arch: any
because it will depend on a different package for different platforms.

This will provide a good migration path for squeeze: people who have
been using a specific MPI implementation can still do so, while those
who want to make their package depend on the default MPI version can
have something in squeeze which should be compatible with squeeze+1.

There's one problem though: mpi-defaults is about to transition from lam
to mpich2 on platforms which don't support openmpi.  This will require a
new mpich2 version of HDF5 to make it work.  I'd be glad to make a patch
for that if you like.

-Adam
-- 
GPG fingerprint: D54D 1AEE B11C CE9B A02B  C5DD 526F 01E8 564E E4B6

Engineering consulting with open source tools
http://www.opennovation.com/
diff -urN debian.old/changelog debian/changelog
--- debian.old/changelog	2010-02-03 08:04:03.000000000 -0500
+++ debian/changelog	2010-02-03 09:27:24.000000000 -0500
@@ -1,3 +1,10 @@
+hdf5 (1.8.4-7) unstable; urgency=low
+
+  * Added libhdf5-mpi-dev package which simply depends on default MPI version
+    of HDF5 for each platform.
+
+ -- Adam C. Powell, IV <hazel...@debian.org>  Wed, 03 Feb 2010 09:02:05 -0500
+
 hdf5 (1.8.4-6) unstable; urgency=low
 
   * Fixed typo in 1.8.4-4 changelog.
diff -urN debian.old/control debian/control
--- debian.old/control	2010-02-03 08:04:03.000000000 -0500
+++ debian/control	2010-02-03 09:27:24.000000000 -0500
@@ -6,7 +6,7 @@
 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 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils
+ sharutils, mpi-default-dev
 Standards-Version: 3.8.3
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -140,6 +140,19 @@
  This package contains development files for use with MPICH. Warning:
  the C++ interface is not provided for this version.
 
+Package: libhdf5-mpi-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: ${hdf5-mpi-dev}, mpi-default-dev
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version
+ HDF5 is a file format and library for storing scientific data. 
+ HDF5 was designed and implemented to address the deficiencies of
+ HDF4.x. It has a more powerful and flexible data model, supports
+ files larger than 2 GB, and supports parallel I/O.
+ .
+ This package depends on the default MPI version of HDF5 for each platform.
+
 Package: libhdf5-doc
 Section: doc
 Architecture: all
diff -urN debian.old/control.in debian/control.in
--- debian.old/control.in	2010-02-03 08:04:03.000000000 -0500
+++ debian/control.in	2010-02-03 09:27:24.000000000 -0500
@@ -6,7 +6,7 @@
 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 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils
+ sharutils, mpi-default-dev
 Standards-Version: 3.8.3
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -140,6 +140,19 @@
  This package contains development files for use with MPICH. Warning:
  the C++ interface is not provided for this version.
 
+Package: libhdf5-mpi-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: ${hdf5-mpi-dev}, mpi-default-dev
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version
+ HDF5 is a file format and library for storing scientific data. 
+ HDF5 was designed and implemented to address the deficiencies of
+ HDF4.x. It has a more powerful and flexible data model, supports
+ files larger than 2 GB, and supports parallel I/O.
+ .
+ This package depends on the default MPI version of HDF5 for each platform.
+
 Package: libhdf5-doc
 Section: doc
 Architecture: all
diff -urN debian.old/rules debian/rules
--- debian.old/rules	2010-02-03 08:04:03.000000000 -0500
+++ debian/rules	2010-02-03 09:27:24.000000000 -0500
@@ -22,6 +22,8 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+DEFAULT_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
+
 patch: patch-stamp
 patch-stamp:
 	QUILT_PATCHES=debian/patches quilt push --color=auto -a || [ $$? = 2 ]
@@ -257,6 +259,7 @@
 binary-arch: prep install-serial install-lam $(install_openmpi) install-mpich
 	dh_testdir
 	dh_testroot 
+	echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > debian/libhdf5-mpi-dev.substvars
 	dh_installdocs $(ARCH_FLAG)
 	dh_installman $(ARCH_FLAG)
 	dh_installchangelogs -a -k release_docs/RELEASE.txt

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to