[feel++] 65/122: try out minimal configuration

[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 9506649de227c9b1e64d8c02731af85234c7346f
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Sat Mar 19 18:04:06 2011 +0000

    try out minimal configuration
---
 debian/changelog |  5 +++--
 debian/rules     | 16 ++++++++++------
 debian/watch     |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 487e93a..0862398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 feel++ (0.90.0-6) unstable; urgency=low
 
-  [Christophe Prud'homme]  
+  [Christophe Prud'homme]
   * debian/patches/s390.patches: fix for s390
+  * debian/rules: tring minimal configuration for failing arches
 
- -- Christophe Prud'homme <prudhomm at debian.org>  Sat, 19 Mar 2011 08:18:56 +0100
+ -- Christophe Prud'homme <prudhomm at debian.org>  Sat, 19 Mar 2011 10:56:20 +0100
 
 feel++ (0.90.0-5) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index a71c333..8df22da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,23 +16,27 @@ DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_DOCUMENTATION=ON
 
 ifeq "$(DEB_BUILD_ARCH)" "powerpc"
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
                       -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON      \
-                      -DENABLE_INSTANTIATION_MODE=OFF
+                      -DFEEL_MINIMAL_CONFIGURATION=ON
 endif
 ifeq "$(DEB_BUILD_ARCH)" "s390"
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
                       -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON      \
-                      -DENABLE_INSTANTIATION_MODE=OFF
+                      -DFEEL_MINIMAL_CONFIGURATION=ON
+endif
+ifeq "$(DEB_BUILD_ARCH)" "armel"
+FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
+                      -DBUILD_TESTING=OFF                  \
+                      -DFEEL_MINIMAL_CONFIGURATION=ON
 endif
 
 ifeq "$(DEB_BUILD_ARCH)" "sparc"
 FEEL_MPI=-DMPI_COMPILER=/usr/bin/mpic++.lam \
          -DMPI_LIBRARY="MPI_LIBRARY-NOTFOUND"
+FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
+                      -DBUILD_TESTING=OFF                  \
+                      -DFEEL_MINIMAL_CONFIGURATION=ON
 else
 FEEL_MPI=
 endif
diff --git a/debian/watch b/debian/watch
index db2f492..6e370c9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-https://ljkforge.imag.fr/frs/?group_id=12&release_id=42 https://ljkforge.imag.fr/frs/download.php/51/feel++-([\d.]+)\.tar\.gz
+https://forge.imag.fr/frs/?group_id=12 feel++-(.+)\.tar\.gz
 

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