r36746 - in /packages/getfem++/trunk/debian: changelog control copyright patches/detect_mumps_libraries.patch patches/gmm_superlu_interface.patch patches/series rules source/ source/format
logari81-guest at users.alioth.debian.org
logari81-guest at users.alioth.debian.org
Wed Jul 21 11:04:48 UTC 2010
Author: logari81-guest
Date: Wed Jul 21 11:04:25 2010
New Revision: 36746
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36746
Log:
New upstream release 4.1.0, convertion to source format 3.0 (quilt)
Added:
packages/getfem++/trunk/debian/patches/detect_mumps_libraries.patch
packages/getfem++/trunk/debian/source/
packages/getfem++/trunk/debian/source/format
Removed:
packages/getfem++/trunk/debian/patches/gmm_superlu_interface.patch
Modified:
packages/getfem++/trunk/debian/changelog
packages/getfem++/trunk/debian/control
packages/getfem++/trunk/debian/copyright
packages/getfem++/trunk/debian/patches/series
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=36746&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/changelog (original)
+++ packages/getfem++/trunk/debian/changelog Wed Jul 21 11:04:25 2010
@@ -1,3 +1,13 @@
+getfem++ (4.1.0-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
+
+ -- 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
Modified: packages/getfem++/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/control?rev=36746&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/control (original)
+++ packages/getfem++/trunk/debian/control Wed Jul 21 11:04:25 2010
@@ -3,11 +3,12 @@
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),
+ autotools-dev, libtool, automake, autoconf,
libblas-dev, libboost-dev, libqhull-dev, libsuperlu3-dev,
- python-numpy, python-all-dev, python-support (>= 1.0.4)
+ libmumps-seq-dev, libmuparser-dev,
+ python-numpy, python-scipy, python-all-dev, python-support (>= 1.0.4)
XS-Python-Version: all
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Section: libs
Homepage: http://home.gna.org/getfem/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getfem++/
@@ -39,7 +40,8 @@
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
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/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/copyright?rev=36746&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/copyright (original)
+++ packages/getfem++/trunk/debian/copyright Wed Jul 21 11:04:25 2010
@@ -5,7 +5,7 @@
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,17 +13,10 @@
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
@@ -75,7 +68,7 @@
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'
Added: packages/getfem++/trunk/debian/patches/detect_mumps_libraries.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/patches/detect_mumps_libraries.patch?rev=36746&op=file
==============================================================================
--- packages/getfem++/trunk/debian/patches/detect_mumps_libraries.patch (added)
+++ packages/getfem++/trunk/debian/patches/detect_mumps_libraries.patch Wed Jul 21 11:04:25 2010
@@ -1,0 +1,94 @@
+Index: getfem-4.1/configure.in
+===================================================================
+--- getfem-4.1.orig/configure.in 2010-07-21 11:38:56.073207816 +0200
++++ getfem-4.1/configure.in 2010-07-21 11:41:21.013205513 +0200
+@@ -504,48 +504,58 @@
+ echo "Configuration of muParser done"
+ dnl ---------------------------END OF MUPARSER TEST--------------------------
+
+-dnl ------------------------------MUMPS------------------------------
+
+-acx_mumps_ok=no
+-
+-AC_ARG_WITH(mumps,
+- [AS_HELP_STRING([--with-mumps=<lib>],[use MUMPS library <lib>])])
+-case $with_mumps in
+- yes | "") ;;
+- no) acx_mumps_ok=disable ;;
+- -* | */* | *.a | *.so | *.so.* | *.o| builtin) MUMPS_LIBS="$with_mumps" ;;
+- *) MUMPS_LIBS="-l$with_mumps" ;;
+-esac
++dnl ------------------------------MUMPS TEST------------------------------
+
+ AC_ARG_WITH(mumps-include-dir,
+ [AS_HELP_STRING([--with-mumps-include-dir],[directory in which the dmumps.h header can be found])],
+- MUMPSINC="-I$withval", MUMPSINC="-I$GFPREFIX/include")
++ [case $withval in
++ -I* ) MUMPSINC="$withval";;
++ * ) MUMPSINC="-I$withval";;
++ esac], MUMPSINC="-I$GFPREFIX/include")
+ CPPFLAGS="$CPPFLAGS $MUMPSINC"
+
+-dnl ------------------------------MUMPS TEST------------------------------
+-usemumps="no"
+ MUMPS_LIBS=""
++acx_mumps_ok=no
++AC_ARG_WITH(mumps,
++ [AS_HELP_STRING([--with-mumps=<lib>],[use MUMPS library <lib>])],
++ [case $with_mumps in
++ yes | "") MUMPS_LIBS="" ;;
++ no) MUMPS_LIBS="" ; acx_mumps_ok=disable ;;
++ -* | */* | *.a | *.so | *.so.* | *.o| builtin) MUMPS_LIBS="$with_mumps" ; acx_mumps_ok=yes ;;
++ *) MUMPS_LIBS=`echo $with_mumps | sed -e 's/^/-l/g;s/ / -l/g'` ; acx_mumps_ok=yes ;;
++ esac], MUMPS_LIBS="")
++
++if test "x$acx_mumps_ok" = "xyes"; then
++ save_LIBS="$LIBS"
++ AC_SEARCH_LIBS(dmumps_c, [`echo $MUMPS_LIBS | sed -e 's/^-l//g;s/ -l/ /g'`],
++ acx_mumps_ok=yes,
++ [ AC_MSG_ERROR([The function dmumps_c couldn't be found in the provided MUMPS libraries]);
++ acx_mumps_ok=disable])
++ LIBS="$save_LIBS"
++fi;
++
+ if test "x$acx_mumps_ok" = "xno"; then
+ AC_ARG_ENABLE(mumps,
+ [AS_HELP_STRING([--enable-mumps],[enable the use of the MUMPS library (Direct parallel LU solver)])],
+- [ if test "x$enableval" = "xyes" ; then usemumps="yes"; fi], [usemumps="no"])
+- MUMPS_LIBS=""
++ [ if test "x$enableval" = "xyes" ; then acx_mumps_ok=yes; fi], [acx_mumps_ok=no])
++ AC_CHECK_LIB(dmumps, dmumps_c, [MUMPS_LIBS="-ldmumps -lzmumps"],
++ [AC_MSG_ERROR([Couldn't found a dmumps library supporting the dmumps_c function]);
++ MUMPS_LIBS="" ; acx_mumps_ok=disable ])
++fi;
+
+- if test "x$usemumps" = "xno"; then
+- echo "Building with MUMPS disabled";
+- else
+- AC_CHECK_LIB(dmumps, dmumps_c)
+- AC_CHECK_HEADERS(dmumps_c.h, [usemumps="yes"],
+- [
+- AC_MSG_ERROR([header file dmumps_c.h not found. Use --enable-mumps=no flag]);
+- usemumps="no"
+- ])
+-
+- if test "x$usemumps" = "xyes"; then
+- MUMPS_LIBS="-ldmumps -lzmumps"
+- fi;
+- echo "Building with MUMPS (use --enable-mumps=no to disable it)"
+- fi;
++usemumps="no"
++if test "x$acx_mumps_ok" = "xno"; then
++ echo "Building with MUMPS disabled";
++elif test "x$acx_mumps_ok" = "xdisable"; then
++ echo "Could not enable MUMPS support. Building without MUMPS";
++else
++ AC_CHECK_HEADERS(dmumps_c.h, [usemumps="yes"],
++ [
++ AC_MSG_ERROR([header file dmumps_c.h not found. Use --enable-mumps=no flag]);
++ usemumps="no" ; MUMPS_LIBS=""
++ ])
++ echo "Building with MUMPS (use --enable-mumps=no to disable it)"
+ fi;
+
+ AM_CONDITIONAL(MUMPS, test x$usemumps = xyes)
Modified: packages/getfem++/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/patches/series?rev=36746&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/patches/series (original)
+++ packages/getfem++/trunk/debian/patches/series Wed Jul 21 11:04:25 2010
@@ -1,1 +1,1 @@
-gmm_superlu_interface.patch
+detect_mumps_libraries.patch
Modified: packages/getfem++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/rules?rev=36746&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/rules (original)
+++ packages/getfem++/trunk/debian/rules Wed Jul 21 11:04:25 2010
@@ -25,12 +25,14 @@
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="-ldmumps_seq -lzmumps_seq -lpord_seq" \
CFLAGS="$(CFLAGS)"
# shared library versions, option 1
-version=4.0.0
+version=4.1.0
major=4
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
#version=`ls src/.libs/lib*.so.* | \
@@ -41,7 +43,6 @@
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
@@ -67,7 +68,6 @@
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
Added: packages/getfem++/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/source/format?rev=36746&op=file
==============================================================================
--- packages/getfem++/trunk/debian/source/format (added)
+++ packages/getfem++/trunk/debian/source/format Wed Jul 21 11:04:25 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list