[Pkg-scicomp-devel] parmetis/trunk/debian

[Christophe Prud'homme]

SVN commit 1992 by prudhomm:

support for all arch

 M  +7 -0      parmetis/trunk/debian/changelog  
 M  +5 -5      parmetis/trunk/debian/control  
 M  +8 -1      parmetis/trunk/debian/rules  


--- parmetis/trunk/debian/changelog #1991:1992
@@ -1,3 +1,10 @@
+parmetis (3.1-10) unstable; urgency=low
+
+  [Christophe Prud'homme]
+  * debian/control,rules: support for all arch
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 04 Jan 2008 13:37:39 +0100
+
 parmetis (3.1-9) unstable; urgency=low
 
   [Christophe Prud'homme]
--- parmetis/trunk/debian/control #1991:1992
@@ -6,10 +6,10 @@
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/parmetis/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/parmetis/
-Build-Depends: cdbs, debhelper (>= 5.0.0), libopenmpi-dev, openmpi-bin
+Build-Depends: cdbs, debhelper (>= 5.0.0), libopenmpi-dev[alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386], openmpi-bin[alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386],  libmpich-dev[hppa mips mipsel s390]
 
 Package: libparmetis-dev
-Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: any
 Section: non-free/libdevel
 Depends: libparmetis3.1 (= ${Source-Version}), libopenmpi-dev|libmpich1.0-dev
 Suggests: parmetis-doc
@@ -24,9 +24,9 @@
  This package contains files needed to develop programs using ParMetis.
 
 Package: libparmetis3.1
-Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: any
 Section: non-free/libs
-Depends: ${shlibs:Depends}, libopenmpi1|libmpich1.0c2
+Depends: ${shlibs:Depends}
 Description: Parallel Graph Partitioning and Sparse Matrix Ordering Shared Libs
  ParMetis computes minimal-cut partitions of graphs and meshes in parallel, and
  orders variables for minimal fill when using direct solvers for sparse
@@ -36,7 +36,7 @@
  This package contains the ParMetis shared libraries.
 
 Package: parmetis-test
-Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: any
 Section: non-free/math
 Depends: ${shlibs:Depends}
 Recommends: parmetis-doc
--- parmetis/trunk/debian/rules #1991:1992
@@ -32,14 +32,20 @@
 INSTALL_PROG=install -D
 INSTALL_DATA=install -m 644 -D
 
+
 #DEB_MAKE_ENVVARS :=
 CFLAGS=-O3
 CXXFLAGS=-O3
-CPPFLAGS=-I. -I.. -I$(DEB_SRCDIR) -I/usr/lib/openmpi/include
+
 XTRALIBS=-lmpi
 LIBS=-lmpi
 LIBDIR=
 
+ifneq ($(findstring $(DEB_HOST_ARCH_CPU),hppa mips mipsel s390),)
+ CPPFLAGS=-I. -I.. -I$(DEB_SRCDIR) -I/usr/lib/mpich/include
+else
+ CPPFLAGS=-I. -I.. -I$(DEB_SRCDIR) -I/usr/lib/openmpi/include
+endif
 
 makebuilddir::
 	-ln -s METISLib metis
@@ -47,3 +53,4 @@
 
 clean::
 	-rm metis parmetis
+	-rm ParMETISLib/ParMETISLib METISLib/METISLib
\ No newline at end of file