[DebianGIS-dev] r1339 - packages/hdf5/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-01-14 08:42:03 +0000 (Mon, 14 Jan 2008)
New Revision: 1339

Removed:
   packages/hdf5/trunk/debian/hdf5-H5public-openmpi.patch
Modified:
   packages/hdf5/trunk/debian/rules
Log:
Unapplying header patch for OpenMPI


Deleted: packages/hdf5/trunk/debian/hdf5-H5public-openmpi.patch
===================================================================
--- packages/hdf5/trunk/debian/hdf5-H5public-openmpi.patch	2008-01-10 13:35:37 UTC (rev 1338)
+++ packages/hdf5/trunk/debian/hdf5-H5public-openmpi.patch	2008-01-14 08:42:03 UTC (rev 1339)
@@ -1,10 +0,0 @@
---- usr/include/H5public.h.old	2008-01-01 16:55:04.000000000 -0500
-+++ usr/include/H5public.h	2008-01-01 16:53:37.000000000 -0500
-@@ -50,6 +50,7 @@
- #   include <stddef.h>
- #endif
- #ifdef H5_HAVE_PARALLEL
-+#   define OMPI_SKIP_MPICXX
- #   include <mpi.h>
- #ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
- #   include <mpio.h>

Modified: packages/hdf5/trunk/debian/rules
===================================================================
--- packages/hdf5/trunk/debian/rules	2008-01-10 13:35:37 UTC (rev 1338)
+++ packages/hdf5/trunk/debian/rules	2008-01-14 08:42:03 UTC (rev 1339)
@@ -163,8 +163,6 @@
 	dh_testroot
 	-mkdir debian/build-openmpi/tmpinst
 	$(MAKE) -C debian/build-openmpi/ install prefix=$(CURDIR)/debian/build-openmpi/tmpinst/usr
-	# patching installed copy of H5public.h for OpenMPI 
-	(cd debian/build-openmpi/tmpinst/usr && patch -p1 < ../../../hdf5-H5public-openmpi.patch)
 	dh_install -p$(openmpipack) -p$(package)-openmpi-dev \
 		--sourcedir=debian/build-openmpi/tmpinst