r37019 - in /packages/getfem++/trunk/debian: changelog control patches/ patches/fix-mumps-checks-configure.patch patches/series

logari81-guest at users.alioth.debian.org logari81-guest at users.alioth.debian.org
Wed Nov 17 07:57:45 UTC 2010


Author: logari81-guest
Date: Wed Nov 17 07:57:43 2010
New Revision: 37019

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37019
Log:
Remove redundant mumps checks in the configure script, drop libatlas-base-dev from build dependencies

Added:
    packages/getfem++/trunk/debian/patches/
    packages/getfem++/trunk/debian/patches/fix-mumps-checks-configure.patch
    packages/getfem++/trunk/debian/patches/series
Modified:
    packages/getfem++/trunk/debian/changelog
    packages/getfem++/trunk/debian/control

Modified: packages/getfem++/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/changelog?rev=37019&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/changelog (original)
+++ packages/getfem++/trunk/debian/changelog Wed Nov 17 07:57:43 2010
@@ -1,9 +1,9 @@
 getfem++ (4.1.1-1) unstable; urgency=low
 
   * New upstream release
-  * Add build dependency on libatlas-base-dev
+  * Remove redundant checks for mumps in the configure script
 
- -- Konstantinos Poulios <poulios.konstantinos at gmail.com>  Fri, 29 Oct 2010 14:38:59 +0200
+ -- Konstantinos Poulios <poulios.konstantinos at gmail.com>  Wed, 17 Nov 2010 08:44:59 +0100
 
 getfem++ (4.1-1) unstable; urgency=low
 

Modified: packages/getfem++/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/control?rev=37019&op=diff
==============================================================================
--- packages/getfem++/trunk/debian/control (original)
+++ packages/getfem++/trunk/debian/control Wed Nov 17 07:57:43 2010
@@ -4,7 +4,7 @@
 Uploaders: Konstantinos Poulios <poulios.konstantinos at gmail.com>
 Build-Depends: debhelper (>= 7),
     autotools-dev, libtool, automake, autoconf,
-    libblas-dev, libatlas-base-dev, libboost-dev, libqhull-dev,
+    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)
 XS-Python-Version: all

Added: packages/getfem++/trunk/debian/patches/fix-mumps-checks-configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/patches/fix-mumps-checks-configure.patch?rev=37019&op=file
==============================================================================
--- packages/getfem++/trunk/debian/patches/fix-mumps-checks-configure.patch (added)
+++ packages/getfem++/trunk/debian/patches/fix-mumps-checks-configure.patch Wed Nov 17 07:57:43 2010
@@ -1,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`

Added: packages/getfem++/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getfem%2B%2B/trunk/debian/patches/series?rev=37019&op=file
==============================================================================
--- packages/getfem++/trunk/debian/patches/series (added)
+++ packages/getfem++/trunk/debian/patches/series Wed Nov 17 07:57:43 2010
@@ -1,0 +1,1 @@
+fix-mumps-checks-configure.patch




More information about the debian-science-commits mailing list