r38299 - in /packages/pastix/trunk/debian: control libpastix-mpi1.install libpastix-seq1.install libpastix1.install patches/scotch-include-guard.patch rules
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Thu Mar 31 16:44:42 UTC 2011
Author: saramito-guest
Date: Thu Mar 31 16:44:41 2011
New Revision: 38299
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38299
Log:
merge seq and mpi into one binary package
Added:
packages/pastix/trunk/debian/libpastix1.install
Removed:
packages/pastix/trunk/debian/libpastix-mpi1.install
packages/pastix/trunk/debian/libpastix-seq1.install
Modified:
packages/pastix/trunk/debian/control
packages/pastix/trunk/debian/patches/scotch-include-guard.patch
packages/pastix/trunk/debian/rules
Modified: packages/pastix/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/control?rev=38299&op=diff
==============================================================================
--- packages/pastix/trunk/debian/control (original)
+++ packages/pastix/trunk/debian/control Thu Mar 31 16:44:41 2011
@@ -4,27 +4,20 @@
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Pierre Saramito <pierre.saramito at imag.fr>
Homepage: http://pastix.gforge.inria.fr
-Build-Depends: debhelper (>=7), gcc
+Build-Depends: quilt, debhelper (>=7), libscotch-dev, libptscotch-dev,
+ mpi-default-dev | openmpi-dev, mpi-default-bin | openmpi-bin
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/pastix/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/pastix/trunk/
-Package: libpastix-seq1
+Package: libpastix1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: pastix-doc
-Description: Parallel sparse matrix package (sequential libraries)
- PaStiX (Parallel Sparse matriX package) is a scientific library that
- provides a high performance parallel solver for very large sparse
- linear systems based on direct and block ILU(k) iterative methods.
-
-Package: libpastix-mpi1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: pastix-doc
-Description: Parallel sparse matrix package (distributed libraries)
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libscotch-dev, libptscotch-dev,
+ mpi-default-dev | openmpi-dev, mpi-default-bin | openmpi-bin
+Suggests: pastix-doc(= ${binary:Version})
+Description: Parallel sparse matrix package (libraries)
PaStiX (Parallel Sparse matriX package) is a scientific library that
provides a high performance parallel solver for very large sparse
linear systems based on direct and block ILU(k) iterative methods.
@@ -32,8 +25,8 @@
Package: libpastix-dev
Section: libdevel
Architecture: any
-Depends: libpastix-seq1(= ${binary:Version}), libpastix-mpi1(= ${binary:Version}), pastix, ${misc:Depends}
-Recommends: pastix-doc
+Depends: libpastix1(= ${binary:Version}), pastix(= ${binary:Version}), ${misc:Depends}
+Recommends: pastix-doc(= ${binary:Version})
Suggests:
Description: Parallel sparse matrix package (headers)
PaStiX (Parallel Sparse matriX package) is a scientific library that
@@ -44,8 +37,6 @@
Section: doc
Architecture: all
Depends: ${misc:Depends}, dpkg (>= 1.15.4)
-Conflicts: libpastix-doc
-Replaces: libpastix-doc
Description: Parallel sparse matrix package (documentation)
PaStiX (Parallel Sparse matriX package) is a scientific library that
provides a high performance parallel solver for very large sparse
@@ -54,8 +45,8 @@
Package: pastix
Section: math
Architecture: any
-Depends: ${shlibs:Depends}, libpastix-seq1, libpastix-mpi1, ${misc:Depends}
-Recommends: libpastix-dev, pastix-doc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libpastix-dev(= ${binary:Version}), pastix-doc(= ${binary:Version})
Description: Parallel sparse matrix package
PaStiX (Parallel Sparse matriX package) is a scientific library that
provides a high performance parallel solver for very large sparse
Added: packages/pastix/trunk/debian/libpastix1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix1.install?rev=38299&op=file
==============================================================================
--- packages/pastix/trunk/debian/libpastix1.install (added)
+++ packages/pastix/trunk/debian/libpastix1.install Thu Mar 31 16:44:41 2011
@@ -1,0 +1,1 @@
+usr/lib/*
Modified: packages/pastix/trunk/debian/patches/scotch-include-guard.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/patches/scotch-include-guard.patch?rev=38299&op=diff
==============================================================================
--- packages/pastix/trunk/debian/patches/scotch-include-guard.patch (original)
+++ packages/pastix/trunk/debian/patches/scotch-include-guard.patch Thu Mar 31 16:44:41 2011
@@ -1,220 +1,198 @@
-*** ./src/order/src/order.h.orig 2011-03-27 20:25:00.000000000 +0200
---- ./src/order/src/order.h 2011-03-28 06:22:51.000000000 +0200
-***************
-*** 40,45 ****
---- 40,66 ----
-
- #define ORDER_H
-
-+ #ifndef NO_MPI
-+ # ifdef FORCE_NOMPI
-+ # include "nompi.h"
-+ # else
-+ # include <mpi.h>
-+ # endif /* FORCE_NOMPI */
-+ #else
-+ # define MPI_Comm int
-+ #endif /* NO_MPI */
-+
-+ #ifdef WITH_SCOTCH
-+ # ifndef _PASTIX_HAVE_SCOTCH_H
-+ # define _PASTIX_HAVE_SCOTCH_H
-+ # ifdef DISTRIBUTED
-+ # include "ptscotch.h"
-+ # else
-+ # include "scotch.h"
-+ # endif
-+ # endif /* _PASTIX_HAVE_SCOTCH_H */
-+ #endif /* WITH_SCOTCH */
-+
- /*
- ** The type and structure definitions.
- */
-*** ./src/sopalin/src/murge.c.orig 2011-03-28 05:47:29.000000000 +0200
---- ./src/sopalin/src/murge.c 2011-03-28 06:28:45.000000000 +0200
-***************
-*** 56,66 ****
- #include "sopalin_define.h"
-
- #ifdef WITH_SCOTCH
-! #ifdef DISTRIBUTED
-! #include "ptscotch.h"
-! #else
-! #include "scotch.h"
-! #endif /* DISTRIBUTED */
- #endif /* WITH_SCOTCH */
-
- #include "ftgt.h"
---- 56,69 ----
- #include "sopalin_define.h"
-
- #ifdef WITH_SCOTCH
-! # ifndef _PASTIX_HAVE_SCOTCH_H
-! # define _PASTIX_HAVE_SCOTCH_H
-! # ifdef DISTRIBUTED
-! # include "ptscotch.h"
-! # else
-! # include "scotch.h"
-! # endif
-! # endif /* _PASTIX_HAVE_SCOTCH_H */
- #endif /* WITH_SCOTCH */
-
- #include "ftgt.h"
-*** ./src/sopalin/src/pastix.c.orig 2011-03-28 05:44:55.000000000 +0200
---- ./src/sopalin/src/pastix.c 2011-03-28 06:27:17.000000000 +0200
-***************
-*** 65,78 ****
- #include "sopalin_define.h"
-
- #ifdef WITH_SCOTCH
-! #ifdef DISTRIBUTED
-! #include "ptscotch.h"
-! #else
-! #include "scotch.h"
-! #endif /* DISTRIBUTED */
- #endif /* WITH_SCOTCH */
-
--
- #include "dof.h"
- #include "ftgt.h"
- #include "symbol.h"
---- 65,80 ----
- #include "sopalin_define.h"
-
- #ifdef WITH_SCOTCH
-! # ifndef _PASTIX_HAVE_SCOTCH_H
-! # define _PASTIX_HAVE_SCOTCH_H
-! # ifdef DISTRIBUTED
-! # include "ptscotch.h"
-! # else
-! # include "scotch.h"
-! # endif
-! # endif /* _PASTIX_HAVE_SCOTCH_H */
- #endif /* WITH_SCOTCH */
-
- #include "dof.h"
- #include "ftgt.h"
- #include "symbol.h"
-*** ./src/sopalin/src/bordi.c.orig 2011-03-28 05:43:56.000000000 +0200
---- ./src/sopalin/src/bordi.c 2011-03-28 06:26:50.000000000 +0200
-***************
-*** 56,69 ****
-
- #include <assert.h>
- #include "common_pastix.h"
- #ifdef WITH_SCOTCH
-! #ifdef DISTRIBUTED
-! #include <mpi.h>
-! #include "ptscotch.h"
-! #else
-! #include "scotch.h"
-! #endif
-! #endif
- #include "dof.h"
- #include "symbol.h"
- #include "order.h"
---- 56,74 ----
-
- #include <assert.h>
- #include "common_pastix.h"
-+
- #ifdef WITH_SCOTCH
-! # ifndef _PASTIX_HAVE_SCOTCH_H
-! # define _PASTIX_HAVE_SCOTCH_H
-! # ifdef DISTRIBUTED
-! # include <mpi.h>
-! # include "ptscotch.h"
-! # else
-! # include "scotch.h"
-! # endif
-! # endif /* _PASTIX_HAVE_SCOTCH_H */
-! #endif /* WITH_SCOTCH */
-!
- #include "dof.h"
- #include "symbol.h"
- #include "order.h"
-*** ./src/fax/src/symbol_faxi_graph.c.orig 2011-03-27 20:48:27.000000000 +0200
---- ./src/fax/src/symbol_faxi_graph.c 2011-03-28 06:25:55.000000000 +0200
-***************
-*** 56,68 ****
- #define SYMBOL_FAXI_INCLUDED
-
- #include "common_pastix.h"
- #ifdef WITH_SCOTCH
-! #ifdef DISTRIBUTED
-! #include <mpi.h>
-! #include "ptscotch.h"
-! #else
-! #include "scotch.h"
-! #endif
- #include "symbol.h"
- #include "order.h"
- #include "fax.h"
---- 56,73 ----
- #define SYMBOL_FAXI_INCLUDED
-
- #include "common_pastix.h"
-+
- #ifdef WITH_SCOTCH
-! # ifndef _PASTIX_HAVE_SCOTCH_H
-! # define _PASTIX_HAVE_SCOTCH_H
-! # ifdef DISTRIBUTED
-! # include <mpi.h>
-! # include "ptscotch.h"
-! # else
-! # include "scotch.h"
-! # endif
-! # endif /* _PASTIX_HAVE_SCOTCH_H */
-!
- #include "symbol.h"
- #include "order.h"
- #include "fax.h"
-*** ./src/fax/src/symbol_fax_graph.c.orig 2011-03-27 20:44:27.000000000 +0200
---- ./src/fax/src/symbol_fax_graph.c 2011-03-28 06:25:46.000000000 +0200
-***************
-*** 58,74 ****
- #define SYMBOL_FAX_GRAPH
-
- #include "common_pastix.h"
-! #ifdef WITH_SCOTCH
-! #ifdef FORCE_NOMPI
-! #include "nompi.h"
-! #else
-! #include <mpi.h>
-! #endif
-! #ifdef DISTRIBUTED
-! #include "ptscotch.h"
- #else
-! #include "scotch.h"
-! #endif
- #include "symbol.h"
- #include "order.h"
- #include "fax.h"
---- 58,84 ----
- #define SYMBOL_FAX_GRAPH
-
- #include "common_pastix.h"
-!
-! #ifndef NO_MPI
-! # ifdef FORCE_NOMPI
-! # include "nompi.h"
-! # else
-! # include <mpi.h>
-! # endif /* FORCE_NOMPI */
- #else
-! # define MPI_Comm int
-! #endif /* NO_MPI */
-!
-! #ifdef WITH_SCOTCH
-! # ifndef _PASTIX_HAVE_SCOTCH_H
-! # define _PASTIX_HAVE_SCOTCH_H
-! # ifdef DISTRIBUTED
-! # include "ptscotch.h"
-! # else
-! # include "scotch.h"
-! # endif
-! # endif /* _PASTIX_HAVE_SCOTCH_H */
-!
- #include "symbol.h"
- #include "order.h"
- #include "fax.h"
+Description: Upstream changes introduced in version 3184-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ pastix (3184-1) unstable; urgency=low
+ .
+ * initial version
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Pierre Saramito <pierre.saramito at imag.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- pastix-3184.orig/src/order/src/order.h
++++ pastix-3184/src/order/src/order.h
+@@ -40,6 +40,27 @@
+
+ #define ORDER_H
+
++#ifndef NO_MPI
++# ifdef FORCE_NOMPI
++# include "nompi.h"
++# else
++# include <mpi.h>
++# endif /* FORCE_NOMPI */
++#else
++# define MPI_Comm int
++#endif /* NO_MPI */
++
++#ifdef WITH_SCOTCH
++# ifndef _PASTIX_HAVE_SCOTCH_H
++# define _PASTIX_HAVE_SCOTCH_H
++# ifdef DISTRIBUTED
++# include "ptscotch.h"
++# else
++# include "scotch.h"
++# endif
++# endif /* _PASTIX_HAVE_SCOTCH_H */
++#endif /* WITH_SCOTCH */
++
+ /*
+ ** The type and structure definitions.
+ */
+--- pastix-3184.orig/src/sopalin/src/murge.c
++++ pastix-3184/src/sopalin/src/murge.c
+@@ -56,11 +56,14 @@
+ #include "sopalin_define.h"
+
+ #ifdef WITH_SCOTCH
+-#ifdef DISTRIBUTED
+-#include "ptscotch.h"
+-#else
+-#include "scotch.h"
+-#endif /* DISTRIBUTED */
++# ifndef _PASTIX_HAVE_SCOTCH_H
++# define _PASTIX_HAVE_SCOTCH_H
++# ifdef DISTRIBUTED
++# include "ptscotch.h"
++# else
++# include "scotch.h"
++# endif
++# endif /* _PASTIX_HAVE_SCOTCH_H */
+ #endif /* WITH_SCOTCH */
+
+ #include "ftgt.h"
+--- pastix-3184.orig/src/sopalin/src/bordi.c
++++ pastix-3184/src/sopalin/src/bordi.c
+@@ -56,14 +56,19 @@
+
+ #include <assert.h>
+ #include "common_pastix.h"
++
+ #ifdef WITH_SCOTCH
+-#ifdef DISTRIBUTED
+-#include <mpi.h>
+-#include "ptscotch.h"
+-#else
+-#include "scotch.h"
+-#endif
+-#endif
++# ifndef _PASTIX_HAVE_SCOTCH_H
++# define _PASTIX_HAVE_SCOTCH_H
++# ifdef DISTRIBUTED
++# include <mpi.h>
++# include "ptscotch.h"
++# else
++# include "scotch.h"
++# endif
++# endif /* _PASTIX_HAVE_SCOTCH_H */
++#endif /* WITH_SCOTCH */
++
+ #include "dof.h"
+ #include "symbol.h"
+ #include "order.h"
+--- pastix-3184.orig/src/sopalin/src/pastix.c
++++ pastix-3184/src/sopalin/src/pastix.c
+@@ -65,14 +65,16 @@
+ #include "sopalin_define.h"
+
+ #ifdef WITH_SCOTCH
+-#ifdef DISTRIBUTED
+-#include "ptscotch.h"
+-#else
+-#include "scotch.h"
+-#endif /* DISTRIBUTED */
++# ifndef _PASTIX_HAVE_SCOTCH_H
++# define _PASTIX_HAVE_SCOTCH_H
++# ifdef DISTRIBUTED
++# include "ptscotch.h"
++# else
++# include "scotch.h"
++# endif
++# endif /* _PASTIX_HAVE_SCOTCH_H */
+ #endif /* WITH_SCOTCH */
+
+-
+ #include "dof.h"
+ #include "ftgt.h"
+ #include "symbol.h"
+--- pastix-3184.orig/src/fax/src/symbol_fax_graph.c
++++ pastix-3184/src/fax/src/symbol_fax_graph.c
+@@ -58,17 +58,27 @@
+ #define SYMBOL_FAX_GRAPH
+
+ #include "common_pastix.h"
+-#ifdef WITH_SCOTCH
+-#ifdef FORCE_NOMPI
+-#include "nompi.h"
+-#else
+-#include <mpi.h>
+-#endif
+-#ifdef DISTRIBUTED
+-#include "ptscotch.h"
++
++#ifndef NO_MPI
++# ifdef FORCE_NOMPI
++# include "nompi.h"
++# else
++# include <mpi.h>
++# endif /* FORCE_NOMPI */
+ #else
+-#include "scotch.h"
+-#endif
++# define MPI_Comm int
++#endif /* NO_MPI */
++
++#ifdef WITH_SCOTCH
++# ifndef _PASTIX_HAVE_SCOTCH_H
++# define _PASTIX_HAVE_SCOTCH_H
++# ifdef DISTRIBUTED
++# include "ptscotch.h"
++# else
++# include "scotch.h"
++# endif
++# endif /* _PASTIX_HAVE_SCOTCH_H */
++
+ #include "symbol.h"
+ #include "order.h"
+ #include "fax.h"
+--- pastix-3184.orig/src/fax/src/symbol_faxi_graph.c
++++ pastix-3184/src/fax/src/symbol_faxi_graph.c
+@@ -56,13 +56,18 @@
+ #define SYMBOL_FAXI_INCLUDED
+
+ #include "common_pastix.h"
++
+ #ifdef WITH_SCOTCH
+-#ifdef DISTRIBUTED
+-#include <mpi.h>
+-#include "ptscotch.h"
+-#else
+-#include "scotch.h"
+-#endif
++# ifndef _PASTIX_HAVE_SCOTCH_H
++# define _PASTIX_HAVE_SCOTCH_H
++# ifdef DISTRIBUTED
++# include <mpi.h>
++# include "ptscotch.h"
++# else
++# include "scotch.h"
++# endif
++# endif /* _PASTIX_HAVE_SCOTCH_H */
++
+ #include "symbol.h"
+ #include "order.h"
+ #include "fax.h"
Modified: packages/pastix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/rules?rev=38299&op=diff
==============================================================================
--- packages/pastix/trunk/debian/rules (original)
+++ packages/pastix/trunk/debian/rules Thu Mar 31 16:44:41 2011
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
#
# TODO:
-# - versions {seq,mpi}-nosmp simultanees & tester avec rheolef : fusion en 1 paquet "libpastix1"
-# pour {seq,mpi}-smp : ca plante en openmpi
+# - tester avec rheolef
+# - fusion en 1 paquet "libpastix1"
+# Note: pour {seq,mpi}-smp : ca plante en openmpi
# - pastix-conf : revoir le script, suivant {seq,mpi} ? wrap + option -{seq,mpi} ?
-# - passer a svn-buildpackage ? demander ouverture... pb: bloque avec paquet scotch
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -82,7 +82,7 @@
# add here commands to install the package into DESTDIR
# $(MAKE) install DESTDIR=$(CURDIR)/$(TMPDIR)
- mkdirhier $(CURDIR)/$(TMPDIR)/usr/include/pastix
+ mkdir -p $(CURDIR)/$(TMPDIR)/usr/include/pastix
cp install/pastix.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
cp install/pastix_nompi.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
cp install/pastix_fortran.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
@@ -90,17 +90,17 @@
cp install/murge.inc $(CURDIR)/$(TMPDIR)/usr/include/pastix
cp src/sopalin/src/cscd_utils.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
- mkdirhier $(CURDIR)/$(TMPDIR)/usr/bin
+ mkdir -p $(CURDIR)/$(TMPDIR)/usr/bin
cp -p install/pastix-conf $(CURDIR)/$(TMPDIR)/usr/bin/pastix-conf
- mkdirhier $(CURDIR)/$(TMPDIR)/usr/share/man/man1
+ mkdir -p $(CURDIR)/$(TMPDIR)/usr/share/man/man1
cp -p debian/pastix-conf.1 $(CURDIR)/$(TMPDIR)/usr/share/man/man1
gzip -9 $(CURDIR)/$(TMPDIR)/usr/share/man/man1/*
- mkdirhier $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc
+ mkdir -p $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc
cp -p doc/refcard/refcard.pdf $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc/pastix-refcard.pdf
# (seq/mpi,nosmp)
- mkdirhier $(CURDIR)/$(TMPDIR)/usr/lib
+ mkdir -p $(CURDIR)/$(TMPDIR)/usr/lib
cp install_seq_nosmp/libpastix.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_seq_nosmp.a
cp install_seq_nosmp/libpastix_murge.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_murge_seq_nosmp.a
cp install_mpi_nosmp/libpastix.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_mpi_nosmp.a
More information about the debian-science-commits
mailing list