diff -Nru libmuscle-3.7+4565/debian/changelog libmuscle-3.7+4565/debian/changelog --- libmuscle-3.7+4565/debian/changelog 2015-04-19 20:08:12.000000000 +0000 +++ libmuscle-3.7+4565/debian/changelog 2016-04-20 07:16:03.000000000 +0000 @@ -1,3 +1,12 @@ +libmuscle (3.7+4565-2) unstable; urgency=medium + + * Take over patches from parsnp to avoid internal copy there + * cme fix dpkg-control + * Source Section: science + * Better hardening + + -- Andreas Tille Wed, 20 Apr 2016 09:15:49 +0200 + libmuscle (3.7+4565-1) unstable; urgency=medium * Initial release (Closes: #782968) diff -Nru libmuscle-3.7+4565/debian/control libmuscle-3.7+4565/debian/control --- libmuscle-3.7+4565/debian/control 2015-04-19 20:08:12.000000000 +0000 +++ libmuscle-3.7+4565/debian/control 2016-04-20 07:16:03.000000000 +0000 @@ -1,15 +1,15 @@ Source: libmuscle Maintainer: Debian Med Packaging Team Uploaders: Andreas Tille -Section: libs +Section: science Priority: optional Build-Depends: debhelper (>= 9), dh-autoreconf, d-shlibs, pkg-config -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libmuscle.git -Vcs-Git: git://anonscm.debian.org/debian-med/libmuscle.git +Vcs-Git: https://anonscm.debian.org/git/debian-med/libmuscle.git Homepage: http://sourceforge.net/p/mauve/code/HEAD/tree/muscle/trunk/ Package: libmuscle-3.7-dev diff -Nru libmuscle-3.7+4565/debian/copyright libmuscle-3.7+4565/debian/copyright --- libmuscle-3.7+4565/debian/copyright 2015-04-19 20:08:12.000000000 +0000 +++ libmuscle-3.7+4565/debian/copyright 2016-04-20 07:16:03.000000000 +0000 @@ -20,7 +20,8 @@ License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation version 2 of the License. + the Free Software Foundation version 2 of the License, or (at your + option) any later version. . On Debian systems, the complete text of the licenses can be found in: GPL-2 - `/usr/share/common-licenses/GPL-2' diff -Nru libmuscle-3.7+4565/debian/patches/parsnp_changes.patch libmuscle-3.7+4565/debian/patches/parsnp_changes.patch --- libmuscle-3.7+4565/debian/patches/parsnp_changes.patch 1970-01-01 00:00:00.000000000 +0000 +++ libmuscle-3.7+4565/debian/patches/parsnp_changes.patch 2016-04-20 07:16:03.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Take over patches from parsnp to avoid internal copy there + The package parsnp + https://anonscm.debian.org/git/debian-med/parsnp.git + contained a code copy of libMUSCLE with the only relevant changes + that are gathered in this patch. Since these enhancements seem to + be valuable in general these are taken over here. +Author: Andreas Tille +Last-Update: Wed, 20 Apr 2016 09:07:57 +0200 + +--- a/libMUSCLE/Makefile.am ++++ b/libMUSCLE/Makefile.am +@@ -1,5 +1,5 @@ + OPTIMIZATION = -O2 -funroll-loops -fomit-frame-pointer -ftree-vectorize +-AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@ ++AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@ -fopenmp + AM_LDFLAGS = $(OPTIMIZATION) + + LIBMUSCLE_H = \ +--- a/libMUSCLE/params.cpp ++++ b/libMUSCLE/params.cpp +@@ -114,7 +114,7 @@ TLS g_bPHYS(false); + //TLS g_scoreGapExtend(0); + TLS g_uMaxIters(8); + TLS g_ulMaxSecs(0); +-TLS g_uMaxMB(500); ++TLS g_uMaxMB(16000); + + TLS g_PPScore(PPSCORE_LE); + TLS g_ObjScore(OBJSCORE_SPM); +--- a/libMUSCLE/threadstorage.h ++++ b/libMUSCLE/threadstorage.h +@@ -9,7 +9,7 @@ + // + + #ifdef _OPENMP +-#define MAX_THREAD_COUNT 16 ++#define MAX_THREAD_COUNT 64 + #define OMP_GET_THREAD_NUM omp_get_thread_num() + #include + #else diff -Nru libmuscle-3.7+4565/debian/patches/series libmuscle-3.7+4565/debian/patches/series --- libmuscle-3.7+4565/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libmuscle-3.7+4565/debian/patches/series 2016-04-20 07:16:03.000000000 +0000 @@ -0,0 +1 @@ +parsnp_changes.patch diff -Nru libmuscle-3.7+4565/debian/rules libmuscle-3.7+4565/debian/rules --- libmuscle-3.7+4565/debian/rules 2015-04-19 20:08:12.000000000 +0000 +++ libmuscle-3.7+4565/debian/rules 2016-04-20 07:16:03.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ --with autoreconf