debian/changelog

-aevol (5.0+ds-1) UNRELEASED; urgency=medium
+aevol (5.0+ds-1) unstable; urgency=medium
 
   * Team upload.
   * Strip m4 files and once at stripping unnneded autogenerated files
     from automake
     Closes: #933628
   * Build-Depends: libopenmpi-dev
+  * Build-Depends: autoconf-archive
+  * Remove debug code from autopkgtest
 
- -- Andreas Tille <tille@debian.org>  Thu, 01 Aug 2019 09:12:07 +0200
+ -- Andreas Tille <tille@debian.org>  Thu, 01 Aug 2019 13:20:27 +0200
 
 aevol (5.0-3) unstable; urgency=medium
 

debian/control

@@ -9,7 +9,8 @@ Build-Depends: debhelper-compat (= 12),
                libboost-dev,
                libboost-system-dev,
                libboost-filesystem-dev,
-               libopenmpi-dev
+               libopenmpi-dev,
+               autoconf-archive
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/aevol
 Vcs-Git: https://salsa.debian.org/med-team/aevol.git

debian/patches/fix_autoconf.patch

-Description: Fow whatever reason this needs to be needed after removing ax_boost macros
-Bug-Debian: https://bugs.debian.org/933628
-Author: Andreas Tille <tille@debian.org>
-Last-Update: Thu, 01 Aug 2019 09:17:45 +0200
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,11 +44,13 @@ AC_PROG_RANLIB
- AC_OPENMP
- AM_PROG_CC_C_O
- 
-+m4_pattern_allow([AC_MSG_ERROR])
-+
- # Print warning if openmp not found
- AC_CHECK_HEADER([omp.h], , [AC_MSG_WARN([openmp not found - continuing without openmp support])])
- 
- # Check for boost
--AX_BOOST_BASE([1.55],, [AC_MSG_ERROR([boost not found, please check that you have boost installed on your system and retry])])
-+AX_BOOST_BASE
- AX_BOOST_SYSTEM
- AX_BOOST_FILESYSTEM
- 

debian/patches/series

-fix_autoconf.patch

debian/tests/run-unit-tests

@@ -8,7 +8,7 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
   # Double quote below to expand the temporary directory variable now versus
   # later is on purpose.
   # shellcheck disable=SC2064
-#  trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
+  trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
 fi
 
 cp /usr/share/doc/${pkg}/examples/* -a "${AUTOPKGTEST_TMP}"
@@ -16,9 +16,6 @@ cp /usr/share/doc/${pkg}/examples/* -a "${AUTOPKGTEST_TMP}"
 cd "${AUTOPKGTEST_TMP}"
 gunzip -r *
 
-# Just for debugging
-set -x
-
 # Run simulation
 cd workflow/wild_type
 aevol_create
@@ -134,4 +131,3 @@ do
    aevol_misc_ancestor_stats lineage-*.ae -M &
    cd ..
 done
-