[SCM] Packaging for getfem++ branch, master, updated. c4edb51d371a4d4119028c696f8289dc82e6ba07
Anton Gladky
gladky.anton at gmail.com
Tue Jan 17 20:55:57 UTC 2012
The following commit has been merged in the master branch:
commit 22b76eeef371ab129f7639eaa7242f9e6ba09e2b
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue Jan 17 21:41:46 2012 +0100
Update debian-directory.
diff --git a/debian/changelog b/debian/changelog
index 2039082..aa3232c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,62 @@
+getfem++ (4.1.1-5) unstable; urgency=low
+
+ * Team upload
+ * Same player try again: fix of the FTBFS under kfreebsd.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 07 Aug 2011 18:04:30 +0200
+
+getfem++ (4.1.1-4) unstable; urgency=low
+
+ * Team upload
+ * FTBFS under kfreebsd. Scilab is disabled (Closes: #636795)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 06 Aug 2011 11:05:54 +0200
+
+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
+ * Upload to unstable
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 07 Feb 2011 11:03:50 +0100
+
+getfem++ (4.1.1-1) experimental; urgency=low
+
+ * Team upload
+ * New upstream release
+ * Increase the soname (Closes: #591514)
+ * Standards-Version updated to version 3.9.1
+ * Creation of the scilab-getfem++ package
+
+ [ Konstantinos Poulios ]
+ * Remove redundant checks for mumps in the configure script
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 30 Nov 2010 00:34:22 +0100
+
+getfem++ (4.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Add dependency of libgetfem++-dev on libgmm++-dev
+ * Enable muparser support
+ * Add build dependency on python-scipy
+ * Enable mumps_seq support
+
+ [ Sylvestre Ledru ]
+ * Update of debian/copyright. Remove reference file to BSD license
+ to include the license directly.
+
+ -- Konstantinos Poulios <poulios.konstantinos at gmail.com> Tue, 20 Jul 2010 08:34:32 +0200
+
getfem++ (4.0.0-4) unstable; urgency=low
* Missing dependency on python-numpy
diff --git a/debian/control b/debian/control
index 9734c0b..ed888b5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,14 @@ Priority: extra
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Konstantinos Poulios <poulios.konstantinos at gmail.com>
Build-Depends: debhelper (>= 7),
- autotools-dev, libtool, automake, autoconf, quilt (>= 0.46-4),
- libblas-dev, libboost-dev, libqhull-dev, libsuperlu3-dev,
- python-numpy, python-all-dev, python-support (>= 1.0.4)
+ autotools-dev, libtool, automake, autoconf,
+ 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 [!mips !kfreebsd-amd64 !kfreebsd-i386],
+ scilab [!mips !kfreebsd-amd64 !kfreebsd-i386]
XS-Python-Version: all
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Section: libs
Homepage: http://home.gna.org/getfem/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getfem++/
@@ -39,7 +42,8 @@ Description: Debugging symbols for the GETFEM++ generic finite element library
Package: libgetfem++-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libgetfem4++ (= ${binary:Version}), libboost-dev
+Depends: ${misc:Depends}, libgetfem4++ (= ${binary:Version}), libboost-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,
@@ -75,3 +79,15 @@ Description: Python interface to the GETFEM++ generic finite element library
and for arbitrary dimension.
.
This package contains the Python interface to GETFEM++.
+
+
+Package: scilab-getfem++
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libgetfem4++ (= ${binary:Version}), scilab
+Description: Scilab interface to 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,
+ and for arbitrary dimension.
+ .
+ This package contains the Scilab interface to GETFEM++.
diff --git a/debian/copyright b/debian/copyright
index 205623e..17db037 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Maintainer: Yves Renard <Yves.Renard at insa-lyon.fr>
Source: http://home.gna.org/getfem/
-Copyright: 1995-2009, Yves Renard <Yves.Renard at insa-lyon.fr>
+Copyright: 1995-2010, Yves Renard <Yves.Renard at insa-lyon.fr>
2000-2009, Julien Pommier <Julien.Pommier at insa-toulouse.fr>
2001-2009, Jeremie Lasry
2002-2009, Vanessa Lleras
@@ -13,19 +13,12 @@ Copyright: 1995-2009, Yves Renard <Yves.Renard at insa-lyon.fr>
2002-2008, Houari Khenous
2002-2008, Jean-Yves Heddebaut
Thorsten Ottosen
+ 2009-2010, Konstantinos Poulios
License: LGPL-2.1+
On Debian systems the full text of the GNU Lesser General Public
License can be found in the `/usr/share/common-licenses/LGPL'
file.
-Files: internal_tools/simplexification_refelt.cc
-Copyright: 2002-2009, Yves Renard <Yves.Renard at insa-lyon.fr>
- 2002-2009, Julien Pommier <Julien.Pommier at insa-toulouse.fr>
-License: LGPL-2.1
- On Debian systems the full text of the GNU Lesser General Public
- License can be found in the `/usr/share/common-licenses/LGPL-2.1'
- file.
-
Files: contrib/icare/icare.cc
Copyright: 2002-2009, Michel Fournié
2002-2009, Nicolas Renon
@@ -46,8 +39,27 @@ Files: src/gmm/gmm_dense_lu.h
Copyright: 1997-2001, The Trustees of Indiana University
1997-2008, Yves Renard
License: BSD and LGPL-2.1+
- On Debian systems the full text of the Berkeley software distribution
- License can be found in the `/usr/share/common-licenses/BSD' file.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the University of California, Berkeley nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE TRUSTEES OF INDIANA UNIVERSITY AND
+ CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE TRUSTEES
+ OF INDIANA UNIVERSITY AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
On Debian systems the full text of the GNU Lesser General Public
License can be found in the `/usr/share/common-licenses/LGPL-2.1'
file.
@@ -65,8 +77,14 @@ Copyright: 1987-1990, John Gilbert
1997-2003, Lawrence Berkeley National Lab
1998-2003, University of Florida
License: BSD and BSD/superlu and Xerox
- On Debian systems the full text of the Berkeley software distribution
- License can be found in the `/usr/share/common-licenses/BSD' file.
+ THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
+ EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+ Permission is hereby granted to use or copy this program for any
+ purpose, provided the above notices are retained on all copies.
+ Permission to modify the code and to distribute modified code is
+ granted, provided the above notices are retained, and a notice that
+ the code was modified is included with the above copyright notice.
+
Files: src/getfem_boost/*
Copyright: 1999-2003, Beman Dawes
@@ -75,7 +93,7 @@ Copyright: 1999-2003, Beman Dawes
License: Boost-1.0
Files: debian/*
-Copyright: 2009, Konstantinos Poulios
+Copyright: 2009-2010, Konstantinos Poulios
License: GPL
On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL'
diff --git a/debian/libgetfem++-dev.install b/debian/libgetfem++-dev.install
index 192080f..1ede072 100644
--- a/debian/libgetfem++-dev.install
+++ b/debian/libgetfem++-dev.install
@@ -3,4 +3,4 @@ usr/include/getfem
usr/include/getfem_boost
usr/lib/libgetfem.so
usr/lib/libgetfem.a
-usr/lib/libgetfem.la
+
diff --git a/debian/patches/addgetfempath.diff b/debian/patches/addgetfempath.diff
new file mode 100644
index 0000000..05942e5
--- /dev/null
+++ b/debian/patches/addgetfempath.diff
@@ -0,0 +1,16 @@
+Index: getfem++-4.1.1/interface/src/scilab/etc/sci_getfem.start
+===================================================================
+--- getfem++-4.1.1.orig/interface/src/scilab/etc/sci_getfem.start 2010-11-30 08:27:45.000000000 +0100
++++ getfem++-4.1.1/interface/src/scilab/etc/sci_getfem.start 2010-11-30 08:29:08.000000000 +0100
+@@ -15,6 +15,11 @@
+ etc_tlbx = getshortpathname(etc_tlbx);
+ root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") );
+
++// Load the native library
++a=ls("/usr//lib/libgetfem.so*");
++link(a(1));
++clear a;
++
+ //Load functions library
+ // =============================================================================
+ mprintf("\tLoad macros\n");
diff --git a/debian/patches/disableXaccess.diff b/debian/patches/disableXaccess.diff
new file mode 100644
index 0000000..46bf3dd
--- /dev/null
+++ b/debian/patches/disableXaccess.diff
@@ -0,0 +1,19 @@
+Index: getfem++-4.1.1/interface/src/scilab/Makefile.am
+===================================================================
+--- getfem++-4.1.1.orig/interface/src/scilab/Makefile.am 2010-11-29 23:20:09.000000000 +0100
++++ getfem++-4.1.1/interface/src/scilab/Makefile.am 2010-11-29 23:20:18.000000000 +0100
+@@ -395,7 +395,7 @@
+ .NOTPARALLEL: *
+
+ all:
+- @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_builder.sce
++ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_builder.sce
+
+ install:
+ $(mkinstalldirs) $(toolboxdir)/demos
+@@ -466,4 +466,4 @@
+ @INSTALL@ -D -m 644 -t $(toolboxdir)/ $(scilabbasedir)
+
+ clean:
+- @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_cleaner.sce
++ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_cleaner.sce
diff --git a/debian/patches/fix-mumps-checks-configure.patch b/debian/patches/fix-mumps-checks-configure.patch
new file mode 100644
index 0000000..e874c18
--- /dev/null
+++ b/debian/patches/fix-mumps-checks-configure.patch
@@ -0,0 +1,286 @@
+Description: Upstream changes introduced in version 4.1.1-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:
+ .
+ getfem++ (4.1.1-1) unstable; urgency=low
+ .
+ * New upstream release
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Konstantinos Poulios <poulios.konstantinos at gmail.com>
+
+---
+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>
+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>
+
+--- getfem++-4.1.1.orig/configure.in
++++ getfem++-4.1.1/configure.in
+@@ -572,34 +572,6 @@ else
+ fi;
+ usemumps="no"]
+ )
+- AC_CHECK_LIB(smumps, smumps_c,
+- [usemumps="yes"],
+- [if test "x$acx_mumps_ok" = "xyes"; then
+- AC_MSG_ERROR([Couldn't find a smumps library supporting the smumps_c function.]);
+- fi;
+- usemumps="no"]
+- )
+- AC_CHECK_LIB(dmumps, dmumps_c,
+- [usemumps="yes"],
+- [if test "x$acx_mumps_ok" = "xyes"; then
+- AC_MSG_ERROR([Couldn't find a dmumps library supporting the dmumps_c function.]);
+- fi;
+- usemumps="no"]
+- )
+- AC_CHECK_LIB(cmumps, cmumps_c,
+- [usemumps="yes"],
+- [if test "x$acx_mumps_ok" = "xyes"; then
+- AC_MSG_ERROR([Couldn't find a cmumps library supporting the cmumps_c function.]);
+- fi;
+- usemumps="no"]
+- )
+- AC_CHECK_LIB(zmumps, zmumps_c,
+- [usemumps="yes"],
+- [if test "x$acx_mumps_ok" = "xyes"; then
+- AC_MSG_ERROR([Couldn't find a zmumps library supporting the zmumps_c function.]);
+- fi;
+- usemumps="no"]
+- )
+ AC_CHECK_HEADERS([smumps_c.h dmumps_c.h cmumps_c.h zmumps_c.h],
+ [usemumps="yes"],
+ [if test "x$acx_mumps_ok" = "xyes"; then
+--- getfem++-4.1.1.orig/configure
++++ getfem++-4.1.1/configure
+@@ -20291,222 +20291,6 @@ else
+
+ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smumps_c in -lsmumps" >&5
+-$as_echo_n "checking for smumps_c in -lsmumps... " >&6; }
+-if test "${ac_cv_lib_smumps_smumps_c+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsmumps $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char smumps_c ();
+-#ifdef FC_DUMMY_MAIN
+-#ifndef FC_DUMMY_MAIN_EQ_F77
+-# ifdef __cplusplus
+- extern "C"
+-# endif
+- int FC_DUMMY_MAIN() { return 1; }
+-#endif
+-#endif
+-int
+-main ()
+-{
+-return smumps_c ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_link "$LINENO"; then :
+- ac_cv_lib_smumps_smumps_c=yes
+-else
+- ac_cv_lib_smumps_smumps_c=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smumps_smumps_c" >&5
+-$as_echo "$ac_cv_lib_smumps_smumps_c" >&6; }
+-if test "x$ac_cv_lib_smumps_smumps_c" = x""yes; then :
+- usemumps="yes"
+-else
+- if test "x$acx_mumps_ok" = "xyes"; then
+- as_fn_error "Couldn't find a smumps library supporting the smumps_c function." "$LINENO" 5;
+- fi;
+- usemumps="no"
+-
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmumps_c in -ldmumps" >&5
+-$as_echo_n "checking for dmumps_c in -ldmumps... " >&6; }
+-if test "${ac_cv_lib_dmumps_dmumps_c+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldmumps $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dmumps_c ();
+-#ifdef FC_DUMMY_MAIN
+-#ifndef FC_DUMMY_MAIN_EQ_F77
+-# ifdef __cplusplus
+- extern "C"
+-# endif
+- int FC_DUMMY_MAIN() { return 1; }
+-#endif
+-#endif
+-int
+-main ()
+-{
+-return dmumps_c ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_link "$LINENO"; then :
+- ac_cv_lib_dmumps_dmumps_c=yes
+-else
+- ac_cv_lib_dmumps_dmumps_c=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmumps_dmumps_c" >&5
+-$as_echo "$ac_cv_lib_dmumps_dmumps_c" >&6; }
+-if test "x$ac_cv_lib_dmumps_dmumps_c" = x""yes; then :
+- usemumps="yes"
+-else
+- if test "x$acx_mumps_ok" = "xyes"; then
+- as_fn_error "Couldn't find a dmumps library supporting the dmumps_c function." "$LINENO" 5;
+- fi;
+- usemumps="no"
+-
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmumps_c in -lcmumps" >&5
+-$as_echo_n "checking for cmumps_c in -lcmumps... " >&6; }
+-if test "${ac_cv_lib_cmumps_cmumps_c+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcmumps $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char cmumps_c ();
+-#ifdef FC_DUMMY_MAIN
+-#ifndef FC_DUMMY_MAIN_EQ_F77
+-# ifdef __cplusplus
+- extern "C"
+-# endif
+- int FC_DUMMY_MAIN() { return 1; }
+-#endif
+-#endif
+-int
+-main ()
+-{
+-return cmumps_c ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_link "$LINENO"; then :
+- ac_cv_lib_cmumps_cmumps_c=yes
+-else
+- ac_cv_lib_cmumps_cmumps_c=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cmumps_cmumps_c" >&5
+-$as_echo "$ac_cv_lib_cmumps_cmumps_c" >&6; }
+-if test "x$ac_cv_lib_cmumps_cmumps_c" = x""yes; then :
+- usemumps="yes"
+-else
+- if test "x$acx_mumps_ok" = "xyes"; then
+- as_fn_error "Couldn't find a cmumps library supporting the cmumps_c function." "$LINENO" 5;
+- fi;
+- usemumps="no"
+-
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zmumps_c in -lzmumps" >&5
+-$as_echo_n "checking for zmumps_c in -lzmumps... " >&6; }
+-if test "${ac_cv_lib_zmumps_zmumps_c+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lzmumps $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char zmumps_c ();
+-#ifdef FC_DUMMY_MAIN
+-#ifndef FC_DUMMY_MAIN_EQ_F77
+-# ifdef __cplusplus
+- extern "C"
+-# endif
+- int FC_DUMMY_MAIN() { return 1; }
+-#endif
+-#endif
+-int
+-main ()
+-{
+-return zmumps_c ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_link "$LINENO"; then :
+- ac_cv_lib_zmumps_zmumps_c=yes
+-else
+- ac_cv_lib_zmumps_zmumps_c=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zmumps_zmumps_c" >&5
+-$as_echo "$ac_cv_lib_zmumps_zmumps_c" >&6; }
+-if test "x$ac_cv_lib_zmumps_zmumps_c" = x""yes; then :
+- usemumps="yes"
+-else
+- if test "x$acx_mumps_ok" = "xyes"; then
+- as_fn_error "Couldn't find a zmumps library supporting the zmumps_c function." "$LINENO" 5;
+- fi;
+- usemumps="no"
+-
+-fi
+-
+ for ac_header in smumps_c.h dmumps_c.h cmumps_c.h zmumps_c.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/debian/patches/gmm_superlu_interface.patch b/debian/patches/gmm_superlu_interface.patch
deleted file mode 100644
index b075153..0000000
--- a/debian/patches/gmm_superlu_interface.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- getfem-4.0.0/src/gmm/gmm_superlu_interface.h.orig 2009-02-21 17:29:49.000000000 +0100
-+++ getfem-4.0.0/src/gmm/gmm_superlu_interface.h 2009-12-08 09:53:44.816055000 +0100
-@@ -195,8 +195,8 @@ namespace gmm {
- StatInit(&stat);
-
- SuperMatrix SA, SL, SU, SB, SX; // SuperLU format.
-- Create_CompCol_Matrix(&SA, m, n, nz, csc_A.pr,
-- (int *)(csc_A.ir), (int *)(csc_A.jc));
-+ Create_CompCol_Matrix(&SA, m, n, nz, (double *)(&(csc_A.pr[0])),
-+ (int *)(&(csc_A.ir[0])), (int *)(&(csc_A.jc[0])));
- Create_Dense_Matrix(&SB, m, nrhs, &rhs[0], m);
- Create_Dense_Matrix(&SX, m, nrhs, &sol[0], m);
- memset(&SL,0,sizeof SL);
-@@ -314,9 +314,10 @@ namespace gmm {
- case 3 : options.ColPerm = COLAMD; break;
- }
- StatInit(&stat);
--
-- Create_CompCol_Matrix(&SA, m, n, nz, csc_A.pr,
-- (int *)(csc_A.ir), (int *)(csc_A.jc));
-+
-+ Create_CompCol_Matrix(&SA, m, n, nz, (double *)(&(csc_A.pr[0])),
-+ (int *)(&(csc_A.ir[0])), (int *)(&(csc_A.jc[0])));
-+
- Create_Dense_Matrix(&SB, m, 0, &rhs[0], m);
- Create_Dense_Matrix(&SX, m, 0, &sol[0], m);
- memset(&SL,0,sizeof SL);
diff --git a/debian/patches/series b/debian/patches/series
index 9555702..fb69d7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
-gmm_superlu_interface.patch
+fix-mumps-checks-configure.patch
+disableXaccess.diff
+addgetfempath.diff
diff --git a/debian/rules b/debian/rules
index 62b1e72..70b39db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,13 +25,21 @@ PYVERS=$(shell pyversions -vr)
configure_flags= $(CROSS) --prefix=/usr \
--enable-boost --enable-shared --with-pic \
- --enable-python --disable-matlab --disable-superlu \
+ --enable-python --enable-muparser \
+ --disable-matlab --disable-superlu \
+ --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.0.0
-major=4
+version=4.1.1
+major=5
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
#version=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
@@ -41,7 +49,6 @@ major=4
configure: configure-stamp
configure-stamp:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
# Add here commands to configure the package.
aclocal -I ./m4
libtoolize -f
@@ -60,14 +67,14 @@ build-stamp: configure-stamp
# Add here commands to compile the package.
$(MAKE)
-
+ # Workaround for the other archs without scilab getfem++
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) clean
@@ -82,6 +89,12 @@ install: build
# Add here commands to install the package into debian/tmp
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ # Workaround for the other archs without scilab getfem++
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
+ mkdir -p $(CURDIR)/debian/scilab-getfem++/usr/share/scilab/contrib/
+ cd $(CURDIR)/debian/scilab-getfem++/usr/share/scilab/contrib/; \
+ rm -f scilab-getfem++; \
+ ln -s ../../../lib/scilab-getfem++/ getfem++
# Build architecture-independent files here.
@@ -116,7 +129,7 @@ binary-arch: install
dh_pysupport --package=python-getfem++
dh_makeshlibs -a
dh_installdeb -a
- dh_shlibdeps -a
+ LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/ dh_shlibdeps -a -- --ignore-missing-info
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
diff --git a/debian/scilab-getfem++.install b/debian/scilab-getfem++.install
new file mode 100644
index 0000000..533c19f
--- /dev/null
+++ b/debian/scilab-getfem++.install
@@ -0,0 +1 @@
+usr/lib/scilab-getfem++/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Packaging for getfem++
More information about the debian-science-commits
mailing list