diff -Nru rapmap-0.4.0+dfsg/debian/changelog rapmap-0.4.0+dfsg/debian/changelog --- rapmap-0.4.0+dfsg/debian/changelog 2016-10-17 14:06:53.000000000 +0000 +++ rapmap-0.4.0+dfsg/debian/changelog 2016-12-05 15:32:20.000000000 +0000 @@ -1,3 +1,15 @@ +rapmap (0.4.0+dfsg-2) unstable; urgency=medium + + * Set NO_NATIVE_ARCH=true + Closes: #847084 + * Do not try downloading libjemalloc + Closes: #847083 + * debhelper 10 + * d/watch: version=4 + * hardening=+all + + -- Andreas Tille Mon, 05 Dec 2016 16:32:20 +0100 + rapmap (0.4.0+dfsg-1) unstable; urgency=medium * New upstream version diff -Nru rapmap-0.4.0+dfsg/debian/compat rapmap-0.4.0+dfsg/debian/compat --- rapmap-0.4.0+dfsg/debian/compat 2016-10-17 14:06:53.000000000 +0000 +++ rapmap-0.4.0+dfsg/debian/compat 2016-12-05 15:32:20.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru rapmap-0.4.0+dfsg/debian/control rapmap-0.4.0+dfsg/debian/control --- rapmap-0.4.0+dfsg/debian/control 2016-10-17 14:06:53.000000000 +0000 +++ rapmap-0.4.0+dfsg/debian/control 2016-12-05 15:32:20.000000000 +0000 @@ -3,7 +3,7 @@ Uploaders: Andreas Tille Section: science Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), cmake, zlib1g-dev, libdivsufsort-dev, diff -Nru rapmap-0.4.0+dfsg/debian/patches/use-debian-libs.patch rapmap-0.4.0+dfsg/debian/patches/use-debian-libs.patch --- rapmap-0.4.0+dfsg/debian/patches/use-debian-libs.patch 2016-10-17 14:06:53.000000000 +0000 +++ rapmap-0.4.0+dfsg/debian/patches/use-debian-libs.patch 2016-12-05 15:32:20.000000000 +0000 @@ -51,6 +51,31 @@ set (FAST_MALLOC_LIB "") set (HAVE_FAST_MALLOC FALSE) +@@ -252,24 +221,6 @@ if (NOT HAVE_FAST_MALLOC) + endif() + endif() + +-if (NOT HAVE_FAST_MALLOC) +- message("Build system will fetch and use JEMalloc") +- message("==================================================================") +- ExternalProject_Add(libjemalloc +- DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external +- DOWNLOAD_COMMAND curl -k -L https://github.com/COMBINE-lab/jemalloc/archive/3.6.0.tar.gz -o jemalloc-3.6.0.tar.gz && +- tar -xzf jemalloc-3.6.0.tar.gz +- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/jemalloc-3.6.0 +- BUILD_IN_SOURCE TRUE +- INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/install +- CONFIGURE_COMMAND sh -c "CC=${CMAKE_C_COMPILER} ./autogen.sh --prefix=" +- INSTALL_COMMAND cp -r lib / && cp -r include / +- ) +- +- set (FAST_MALLOC_LIB ${CMAKE_CURRENT_SOURCE_DIR}/external/install/lib/libjemalloc.a) +- set (HAVE_FAST_MALLOC TRUE) +-endif () +- + ### + # + # Done building external dependencies. --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -84,9 +84,12 @@ set (SUFFARRAY64_LIB ${GAT_SOURCE_DIR}/e diff -Nru rapmap-0.4.0+dfsg/debian/rules rapmap-0.4.0+dfsg/debian/rules --- rapmap-0.4.0+dfsg/debian/rules 2016-10-17 14:06:53.000000000 +0000 +++ rapmap-0.4.0+dfsg/debian/rules 2016-12-05 15:32:20.000000000 +0000 @@ -3,13 +3,13 @@ # DH_VERBOSE := 1 # for hardening you might like to uncomment this: -export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ override_dh_auto_configure: - dh_auto_configure -- -DJELLYFISH_ROOT=/usr + dh_auto_configure -- -DJELLYFISH_ROOT=/usr -DNO_NATIVE_ARCH=true override_dh_auto_build: dh_auto_build diff -Nru rapmap-0.4.0+dfsg/debian/watch rapmap-0.4.0+dfsg/debian/watch --- rapmap-0.4.0+dfsg/debian/watch 2016-10-17 14:06:53.000000000 +0000 +++ rapmap-0.4.0+dfsg/debian/watch 2016-12-05 15:32:20.000000000 +0000 @@ -1,4 +1,4 @@ -version=3 +version=4 opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \ https://github.com/COMBINE-lab/RapMap/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)