[SCM] Packaging for getfem++ branch, master, updated. debian/4.2+dfsg1-1-3-gd8f89e4
Anton Gladky
gladky.anton at gmail.com
Sun Jun 30 15:32:25 UTC 2013
The following commit has been merged in the master branch:
commit ed398d5d60310a64583920948fb7db63ce32bd1e
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sun Jun 30 17:31:20 2013 +0200
Remove obsolete patches.
diff --git a/debian/patches/fix-gcc-4.7-ftbfs.patch b/debian/patches/fix-gcc-4.7-ftbfs.patch
deleted file mode 100644
index 19eafaf..0000000
--- a/debian/patches/fix-gcc-4.7-ftbfs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: fix FTBFS with gcc-4.7
-Author: Philipp Büttgenbach <Philipp.Buettgenbach at gmx.de>
-Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-04-20
-
---- a/src/gmm/gmm_except.h
-+++ b/src/gmm/gmm_except.h
-@@ -76,7 +76,7 @@
- }
- # define GMM_THROW_(type, errormsg) { \
- std::stringstream msg; \
-- msg << "Error in "__FILE__ << ", line " \
-+ msg << "Error in " << __FILE__ << ", line " \
- << __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n" \
- << errormsg << ends; \
- throw (type)(msg.str()); \
-@@ -91,7 +91,7 @@
- }
- # define GMM_THROW_(type, errormsg) { \
- std::stringstream msg; \
-- msg << "Error in "__FILE__ << ", line " \
-+ msg << "Error in " << __FILE__ << ", line " \
- << __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n" \
- << errormsg << ends; \
- ::abort(); \
-@@ -148,7 +148,7 @@
-
- #define GMM_WARNING_MSG(level_, thestr) { \
- std::stringstream msg; \
-- msg << "Level " << level_ << " Warning in "__FILE__ << ", line " \
-+ msg << "Level " << level_ << " Warning in " << __FILE__ << ", line " \
- << __LINE__ << ": " << thestr << ends; \
- std::cerr << msg.str() << std::endl; \
- }
-@@ -210,7 +210,7 @@
- #define GMM_TRACE_MSG(level_, thestr) { \
- GMM_TRACE_MSG_MPI { \
- std::stringstream msg; \
-- msg << "Trace " << level_ << " in "__FILE__ << ", line " \
-+ msg << "Trace " << level_ << " in " << __FILE__ << ", line " \
- << __LINE__ << ": " << thestr \
- << ends; \
- std::cout << msg.str() << std::endl; \
diff --git a/debian/patches/fix-gcc-4.7-ftbfs_part2.patch b/debian/patches/fix-gcc-4.7-ftbfs_part2.patch
deleted file mode 100644
index 228bf9e..0000000
--- a/debian/patches/fix-gcc-4.7-ftbfs_part2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: fix FTBFS with gcc-4.7
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-05-25
-
---- a/src/gmm/gmm_vector.h
-+++ b/src/gmm/gmm_vector.h
-@@ -235,14 +235,14 @@
- template<typename T> void wsvector<T>::clean(double eps) {
- iterator it = this->begin(), itf = it, ite = this->end();
- while (it != ite) {
-- ++itf; if (gmm::abs(it->second) <= eps) erase(it); it = itf;
-+ ++itf; if (gmm::abs(it->second) <= eps) base_type::erase(it); it = itf;
- }
- }
-
- template<typename T> void wsvector<T>::resize(size_type n) {
- if (n < nbl) {
- iterator it = this->begin(), itf = it, ite = this->end();
-- while (it != ite) { ++itf; if (it->first >= n) erase(it); it = itf; }
-+ while (it != ite) { ++itf; if (it->first >= n) base_type::erase(it); it = itf; }
- }
- nbl = n;
- }
---- a/src/getfem/bgeot_tensor.h
-+++ b/src/getfem/bgeot_tensor.h
-@@ -187,7 +187,7 @@
- sizes_ = c; coeff.resize(c.size());
- multi_index::iterator p = coeff.begin(), pe = coeff.end();
- for ( ; p != pe; ++p, ++it) { *p = short_type(d); d *= *it; }
-- resize(d);
-+ this->resize(d);
- }
-
- void adjust_sizes(const multi_index &mi) {
---- a/src/getfem/getfem_modeling.h
-+++ b/src/getfem/getfem_modeling.h
-@@ -863,7 +863,7 @@
- const mesh_fem &mf_vm,
- VECTVM &VM, bool tresca) {
- getfem::interpolation_von_mises_or_tresca
-- (this->mf_u,mf_vm,get_solution(MS),VM,
-+ (this->mf_u,mf_vm,this->get_solution(MS),VM,
- lambda().mf(),lambda().get(),mu().mf(),mu().get(),tresca);
- }
- };
---- a/src/getfem/getfem_assembling_tensors.h
-+++ b/src/getfem/getfem_assembling_tensors.h
-@@ -451,7 +451,7 @@
- if (sz == 0)
- ASM_THROW_TENSOR_ERROR("can't create a vector of size " << r);
- asm_vec<VEC> v(new VEC(sz));
-- push_back(v); return &this->back();
-+ this->push_back(v); return &this->back();
- }
- ~vec_factory() {
- for (size_type i=0; i < this->size(); ++i) {
-@@ -493,7 +493,7 @@
- : public base_mat_factory, private std::deque<asm_mat<MAT> > {
- public:
- base_asm_mat* create_mat(size_type m, size_type n) {
-- push_back(asm_mat<MAT>(new MAT(m, n))); return &this->back();
-+ this->push_back(asm_mat<MAT>(new MAT(m, n))); return &this->back();
- }
- ~mat_factory() {
- for (size_type i=0; i < this->size(); ++i) {
diff --git a/debian/patches/fix-mumps-checks-configure.patch b/debian/patches/fix-mumps-checks-configure.patch
deleted file mode 100644
index e874c18..0000000
--- a/debian/patches/fix-mumps-checks-configure.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-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/series b/debian/patches/series
index 901ea32..5de4d4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@ disableXaccess.diff
addgetfempath.diff
ld-no-add-needed.patch
fix_mumps_error.patch
-#inlineequation.diff
-
stream_redirect.diff
respect_nometis_flag.patch
disable_some_tests.patch
--
Packaging for getfem++
More information about the debian-science-commits
mailing list