[SCM] Packaging for getfem++ branch, master, updated. upstream/4.1.1-17-g63742cb

[Anton Gladky]

The following commit has been merged in the master branch:
commit f97ed7133f912d1d9cda4a7484ea3c6355a8f0e3
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Jan 30 22:01:28 2012 +0100

    Disable muparser on hurd-i386, because libmuparser-dev does not persist on this platform.

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..b0665c9
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1 @@
+* enable muparser, when libmuparser-dev appears on hurd-i386 platform
diff --git a/debian/control b/debian/control
index 077c1f0..b723612 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Konstantinos Poulios <poulios.konstantinos at gmail.com>,
 Build-Depends: debhelper (>= 9),
     autotools-dev, libtool, automake, autoconf,
     libblas-dev, libboost-dev, libqhull-dev,
-    libsuperlu3-dev, libmumps-seq-dev, libmuparser-dev,
+    libsuperlu3-dev, libmumps-seq-dev, libmuparser-dev [!hurd-i386],
     python-numpy, python-scipy, python-all-dev, python-support (>= 1.0.4),
     scilab-include  [!mips !kfreebsd-amd64 !kfreebsd-i386],
     scilab [!mips !kfreebsd-amd64 !kfreebsd-i386]
@@ -43,7 +43,7 @@ Package: libgetfem++-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libgetfem4++ (= ${binary:Version}), libboost-dev,
-    libgmm++-dev, libsuperlu3-dev, libmuparser-dev
+    libgmm++-dev, libsuperlu3-dev, libmuparser-dev [!hurd-i386]
 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,
diff --git a/debian/rules b/debian/rules
index 2a63f96..6c48b14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 else
@@ -20,7 +21,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 configure_flags= $(CROSS) --prefix=/usr \
 		--enable-boost --enable-shared --with-pic \
-		--enable-python --enable-muparser \
+		--enable-python \
 		--disable-matlab --disable-superlu \
 		--with-mumps="-lsmumps_seq -ldmumps_seq -lcmumps_seq -lzmumps_seq -lpord_seq" \
 		CFLAGS="$(CFLAGS)" \
@@ -35,6 +36,15 @@ else
 	configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
 endif
 
+disable_muparser_archs = hurd-i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_muparser_archs)))
+	configure_flags += --disable-muparser
+else
+	configure_flags += --enable-muparser 
+endif
+
+
+
 # shared library versions, option 1
 version=4.1.1
 major=5

-- 
Packaging for getfem++