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

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-03-31 14:49:21 +0000 (Mon, 31 Mar 2008)
New Revision: 1488

Modified:
   packages/hdf5/trunk/debian/changelog
   packages/hdf5/trunk/debian/control.in
   packages/hdf5/trunk/debian/rules
Log:
Fixating FTBS due to missing OpenMPI on some archs.


Modified: packages/hdf5/trunk/debian/changelog
===================================================================
--- packages/hdf5/trunk/debian/changelog	2008-03-30 19:43:17 UTC (rev 1487)
+++ packages/hdf5/trunk/debian/changelog	2008-03-31 14:49:21 UTC (rev 1488)
@@ -1,8 +1,10 @@
-hdf5 (1.6.6-2) UNRELEASED; urgency=low
+hdf5 (1.6.6-2) unstable; urgency=low
 
   * Fixed changelog due to patch dropped before release, but still logged.
+  * Do not create the libdhf5-openmpi-* packages on some selected
+    architectures. Thanks Rafael Laboissiere (closes: #473328).
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 20 Mar 2008 12:55:54 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 31 Mar 2008 16:47:51 +0200
 
 hdf5 (1.6.6-1) unstable; urgency=low
 

Modified: packages/hdf5/trunk/debian/control.in
===================================================================
--- packages/hdf5/trunk/debian/control.in	2008-03-30 19:43:17 UTC (rev 1487)
+++ packages/hdf5/trunk/debian/control.in	2008-03-31 14:49:21 UTC (rev 1488)
@@ -3,7 +3,8 @@
 Priority: optional
 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), libopenmpi-dev, libjpeg62-dev, debhelper (>> 5)
+Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), 
+ libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev, debhelper (>> 5)
 Standards-Version: 3.7.3
 Homepage: http://hdf.ncsa.uiuc.edu/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -72,7 +73,7 @@
 Package: libhdf5-openmpi- at VERSION@-0
 Section: libs
 Priority: extra
-Architecture: any
+Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5- at VERSION@-0
 Provides: libhdf5- at VERSION@-0
@@ -87,7 +88,7 @@
 Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
-Architecture: any
+Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
 Depends: libhdf5-openmpi- at VERSION@-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, libopenmpi-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev

Modified: packages/hdf5/trunk/debian/rules
===================================================================
--- packages/hdf5/trunk/debian/rules	2008-03-30 19:43:17 UTC (rev 1487)
+++ packages/hdf5/trunk/debian/rules	2008-03-31 14:49:21 UTC (rev 1488)
@@ -18,7 +18,34 @@
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+ifeq ($(DEB_BUILD_ARCH),arm)
+build_openmpi = no
+else ifeq ($(DEB_BUILD_ARCH),armel)
+build_openmpi = no
+else ifeq ($(DEB_BUILD_ARCH),hppa)
+build_openmpi = no
+else ifeq ($(DEB_BUILD_ARCH),mips)
+build_openmpi = no
+else ifeq ($(DEB_BUILD_ARCH),mipsel)
+build_openmpi = no
+else ifeq ($(DEB_BUILD_ARCH),s390)
+build_openmpi = no
+else
+build_openmpi = yes
+endif
+
+ifeq ($(build_openmpi),yes)
+configure_stamp_openmpi = configure-stamp-openmpi
+build_stamp_openmpi = build-stamp-openmpi
+install_openmpi = install-openmpi
+else
+configure_stamp_openmpi =
+build_stamp_openmpi = 
+install_openmpi =
+endif
+
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        USE_PROD = yes
 else
@@ -49,7 +76,7 @@
 		  --enable-shared --enable-production=$(USE_PROD)
 
 
-configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam configure-stamp-openmpi configure-stamp-mpich
+configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam $(configure-stamp-openmpi) configure-stamp-mpich
 
 configure-stamp-debian: debian/control.in
 	cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
@@ -107,7 +134,7 @@
 		--enable-parallel=yes
 	touch configure-stamp-mpich
 
-build: build-stamp-serial build-stamp-lam build-stamp-openmpi build-stamp-mpich
+build: build-stamp-serial build-stamp-lam $(build-stamp-openmpi) build-stamp-mpich
 
 build-stamp-serial: configure-stamp-serial
 	dh_testdir
@@ -191,7 +218,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install-serial install-lam install-openmpi install-mpich
+binary-arch: build install-serial install-lam $(install-openmpi) install-mpich
 	dh_testdir
 	dh_testroot 
 	dh_installdocs -a
@@ -203,13 +230,17 @@
 	dh_fixperms -a
 #	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 -a
 	dh_shlibdeps -phdf5-tools -L$(serpack) -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)
 	dh_shlibdeps -p$(openmpipack) -L$(openmpipack) -ldebian/$(openmpipack)/usr/lib
+endif
 	dh_shlibdeps -p$(mpichpack) -L$(mpichpack) -ldebian/$(mpichpack)/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a