This is an automated email from the git hooks/post-receive script. lkajan pushed a commit to branch master in repository freecontact.
commit 3972e1c8a513557015cd94c670e3c5062e1c3405 Author: Laszlo Kajan <[email protected]> Date: Sat Sep 28 10:04:04 2013 +0200 Imported Upstream version 1.0.21 --- ChangeLog | 6 ++++++ configure | 20 ++++++++++---------- configure.ac | 2 +- lib/config.h | 6 +++--- lib/freecontact.cpp | 3 +++ lib/freecontact.h | 4 +--- src/_write_bioxsd.cpp | 1 + 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa0e5fa..39f3cc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +freecontact (1.0.21) unstable; urgency=low + + * lib/freecontact.h no longer includes boost/format.hpp. + + -- Laszlo Kajan <[email protected]> Sat, 28 Sep 2013 09:43:07 +0200 + freecontact (1.0.20) unstable; urgency=low * Fixed runtime issues with timer_create(CLOCK_PROCESS_CPUTIME_ID,...) on diff --git a/configure b/configure index 04ab1ab..29190b9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for freecontact 1.0.20. +# Generated by GNU Autoconf 2.69 for freecontact 1.0.21. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='freecontact' PACKAGE_TARNAME='freecontact' -PACKAGE_VERSION='1.0.20' -PACKAGE_STRING='freecontact 1.0.20' +PACKAGE_VERSION='1.0.21' +PACKAGE_STRING='freecontact 1.0.21' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1424,7 +1424,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures freecontact 1.0.20 to adapt to many kinds of systems. +\`configure' configures freecontact 1.0.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1494,7 +1494,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of freecontact 1.0.20:";; + short | recursive ) echo "Configuration of freecontact 1.0.21:";; esac cat <<\_ACEOF @@ -1643,7 +1643,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -freecontact configure 1.0.20 +freecontact configure 1.0.21 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2331,7 +2331,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by freecontact $as_me 1.0.20, which was +It was created by freecontact $as_me 1.0.21, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3199,7 +3199,7 @@ fi # Define the identity of the package. PACKAGE='freecontact' - VERSION='1.0.20' + VERSION='1.0.21' cat >>confdefs.h <<_ACEOF @@ -28681,7 +28681,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by freecontact $as_me 1.0.20, which was +This file was extended by freecontact $as_me 1.0.21, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28747,7 +28747,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -freecontact config.status 1.0.20 +freecontact config.status 1.0.21 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c42619d..b15ff42 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -AC_INIT([freecontact], [1.0.20], [[email protected]]) +AC_INIT([freecontact], [1.0.21], [[email protected]]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/freecontact.cpp]) diff --git a/lib/config.h b/lib/config.h index 651c978..2725c00 100644 --- a/lib/config.h +++ b/lib/config.h @@ -103,7 +103,7 @@ #define PACKAGE_NAME "freecontact" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "freecontact 1.0.20" +#define PACKAGE_STRING "freecontact 1.0.21" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "freecontact" @@ -112,7 +112,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.20" +#define PACKAGE_VERSION "1.0.21" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -122,4 +122,4 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.0.20" +#define VERSION "1.0.21" diff --git a/lib/freecontact.cpp b/lib/freecontact.cpp index e7e6c86..66a1851 100644 --- a/lib/freecontact.cpp +++ b/lib/freecontact.cpp @@ -19,6 +19,7 @@ #ifdef HAVE_OPENMP #include <omp.h> #endif +#include <boost/format.hpp> #include <cblas.h> #include <iomanip> #include <iostream> @@ -32,6 +33,8 @@ // lkajan: EVfold-mfDCA is calculate_evolutionary_constraints.m +namespace bo = boost; + typedef float g_fp_t; // n S L thr maxIt msg warm X W Wd WXj info brk extern "C" void glassofast_(int *, g_fp_t *, g_fp_t *, g_fp_t *, int *, int *, int *, g_fp_t *, g_fp_t *, g_fp_t *, g_fp_t *, int *, int *); diff --git a/lib/freecontact.h b/lib/freecontact.h index 08174ff..bfa7621 100644 --- a/lib/freecontact.h +++ b/lib/freecontact.h @@ -17,10 +17,10 @@ #ifndef LIBFREECONTACT_H #define LIBFREECONTACT_H -#include <boost/format.hpp> #include <errno.h> #include <map> #include <math.h> +#include <stdexcept> #include <stdint.h> #include <string.h> #include <vector> @@ -49,8 +49,6 @@ static const uint8_t mapaa[] = { '-', 'X' }; -namespace bo = boost; - /// Alignment length exception. class LIBFREEC_API alilen_error : public std::runtime_error { public: diff --git a/src/_write_bioxsd.cpp b/src/_write_bioxsd.cpp index 9bf9437..f5ad6a7 100644 --- a/src/_write_bioxsd.cpp +++ b/src/_write_bioxsd.cpp @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <boost/format.hpp> #include <iostream> #include "fc.h" #include "freecontact_input_xsd.hxx" -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
