[feel++] 29/122: commentaires suite

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository feel++.

commit 8f6247df5a67e4cb2e5f82944790c51931ef1884
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Mon Aug 16 18:05:00 2010 +0000

    commentaires suite
---
 debian/changelog |  7 +++++++
 debian/control   | 10 +++++-----
 debian/rules     | 12 ++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7451c83..a17c3f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+life (0.9.25~svn6454-1) unstable; urgency=low
+
+  [Christophe Prud'homme]
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 16 Aug 2010 20:02:57 +0200
+
 life (0.9.24-7) unstable; urgency=low
 
   [Christophe Prud'homme]
diff --git a/debian/control b/debian/control
index 52e91ec..29a3742 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.4, gfortran-4
 	       libeigen2-dev, libxml2-dev,
 	       gmsh, transfig, imagemagick, texlive-latex-extra, texlive-base-bin, pgf,
                doxygen, ghostscript
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://ljkforge.imag.fr/life
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/life/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/life/trunk
@@ -23,7 +23,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/life/trunk
 
 Package: liblife
 Section: libs
-Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc powerpc
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gmsh, mpi-default-bin
 Description: A library for the finite element method
  This package provides the dynamic Life libraries.
@@ -60,7 +60,7 @@ Description: A library for the finite element method
 
 Package: liblife-dev
 Section: libdevel
-Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc powerpc
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblife, libvtk5-dev, libeigen2-dev, mpi-default-dev,
          libtrilinos-dev, libpetsc3.1-dev (>= 3.1.dfsg-3), libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-4), libgmm++-dev,
          libsuperlu3-dev, libsuitesparse-dev, libscotchmetis-dev,
@@ -100,7 +100,7 @@ Description: A library for the finite element method
 
 Package: liblife-dbg
 Section: debug
-Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc powerpc
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblife-dev
 Description: A library for the finite element method
  Life is a versatile finite element library to solve partial
@@ -134,7 +134,7 @@ Description: A library for the finite element method
 
 Package: life-apps
 Section: science
-Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc powerpc
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblife, gmsh
 Recommends: paraview
 Description: A library for the finite element method
diff --git a/debian/rules b/debian/rules
index 1e3c017..3dc1d78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,23 @@ export CXXFLAGS=
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=ON
+
 ifeq "$(DEB_BUILD_ARCH)" "powerpc"
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=OFF                \
                       -DBUILD_TESTING=OFF                  \
                       -DLIFE_MINIMAL_CONFIGURATION=ON      \
                       -DENABLE_INSTANTIATION_MODE=OFF
-else
-LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=ON
 endif
+ifeq "$(DEB_BUILD_ARCH)" "s390"
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=OFF                \
+                      -DBUILD_TESTING=OFF                  \
+                      -DLIFE_MINIMAL_CONFIGURATION=ON      \
+                      -DENABLE_INSTANTIATION_MODE=OFF
+endif
+
 ifeq "$(DEB_BUILD_ARCH)" "sparc"
 LIFE_MPI=-DMPI_COMPILER=/usr/bin/mpic++.lam \
          -DMPI_LIBRARY="MPI_LIBRARY-NOTFOUND"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/feel++.git