r38669 - in /packages/getfem++/trunk/debian: changelog control libgetfem++-dev.install rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Aug  5 15:46:23 2011
New Revision: 38669

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38669
Log:
  * Disable scilab-getfem++ under kfreebsd-* and mips until the openjdk is
    ported/fixed on these archs (Closes: #624323)
  * Kill the .la file (Closes: #621311)
  * Add libmuparser-dev and libsuperlu3-dev to the dependencies of
    libgetfem++-dev to make getfem-config working out of the box
    (Closes: #596916)

Modified:
    packages/getfem++/trunk/debian/changelog
    packages/getfem++/trunk/debian/control
    packages/getfem++/trunk/debian/libgetfem++-dev.install
    packages/getfem++/trunk/debian/rules

Modified: packages/getfem++/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/changelog?rev=38669&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/changelog (original)
+++ packages/getfem++/trunk/debian/changelog Fri Aug  5 15:46:23 2011
@@ -1,3 +1,14 @@
+getfem++ (4.1.1-3) unstable; urgency=low
+
+  * Disable scilab-getfem++ under kfreebsd-* and mips until the openjdk is
+    ported/fixed on these archs (Closes: #624323)
+  * Kill the .la file (Closes: #621311)
+  * Add libmuparser-dev and libsuperlu3-dev to the dependencies of
+    libgetfem++-dev to make getfem-config working out of the box
+    (Closes: #596916)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 05 Aug 2011 16:44:59 +0200
+
 getfem++ (4.1.1-2) unstable; urgency=low
 
   * Team upload

Modified: packages/getfem++/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/control?rev=38669&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/control (original)
+++ packages/getfem++/trunk/debian/control Fri Aug  5 15:46:23 2011
@@ -7,9 +7,10 @@
     libblas-dev, libboost-dev, libqhull-dev,
     libsuperlu3-dev, libmumps-seq-dev, libmuparser-dev,
     python-numpy, python-scipy, python-all-dev, python-support (>= 1.0.4),
-    scilab-include, scilab
+    scilab-include  [!mips !kfreebsd-amd64 !kfreebsd-i386],
+    scilab [!mips !kfreebsd-amd64 !kfreebsd-i386]
 XS-Python-Version: all
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: libs
 Homepage: http://home.gna.org/getfem/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getfem++/
@@ -42,7 +43,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libgetfem4++ (= ${binary:Version}), libboost-dev,
-    libgmm++-dev
+    libgmm++-dev, libsuperlu3-dev, libmuparser-dev
 Description: Development files for the GETFEM++ generic finite element library
  GETFEM++ is a library allowing the computation of any elementary matrix (even
  for mixed finite element methods) on the largest class of methods and elements,

Modified: packages/getfem++/trunk/debian/libgetfem++-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/libgetfem%2B%2B-dev.install?rev=38669&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/libgetfem++-dev.install (original)
+++ packages/getfem++/trunk/debian/libgetfem++-dev.install Fri Aug  5 15:46:23 2011
@@ -3,4 +3,4 @@
 usr/include/getfem_boost
 usr/lib/libgetfem.so
 usr/lib/libgetfem.a
-usr/lib/libgetfem.la
+

Modified: packages/getfem++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/rules?rev=38669&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/rules (original)
+++ packages/getfem++/trunk/debian/rules Fri Aug  5 15:46:23 2011
@@ -27,9 +27,15 @@
 		--enable-boost --enable-shared --with-pic \
 		--enable-python --enable-muparser \
 		--disable-matlab --disable-superlu \
-		--enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/ \
 		--with-mumps="-lsmumps_seq -ldmumps_seq -lcmumps_seq -lzmumps_seq -lpord_seq" \
 		CFLAGS="$(CFLAGS)"
+
+disable_scilab_archs   = mips kfreebsd-amd64 kfreebsd-i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_scilab_archs)))
+	configure_flags += --disable-scilab
+else
+	configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
+endif
 
 # shared library versions, option 1
 version=4.1.1