[med-svn] [seqan2] 01/01: remove jinja2; async-io (sometimes)

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to tag debian/2.3.2+dfsg2-2
in repository seqan2.

commit 0b62576ddc0cd8ddae764fa4d41c89e05c420348
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Fri Oct 13 09:45:07 2017 -0700

    remove jinja2; async-io (sometimes)
---
 debian/changelog |  9 +++++++++
 debian/control   | 22 +++++++++++-----------
 debian/rules     | 30 +++++++++++++++++++-----------
 debian/watch     |  4 ++--
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a2dcf0..f8dac25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+seqan2 (2.3.2+dfsg2-2) unstable; urgency=medium
+
+  * As per upstream, disable async-io for many platforms
+  * Remove jinja2, python-nose, and dh-linktree dependencies as we are not yet
+    building the docs
+  * Switch to GitHub releases for HTTPS protection
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Fri, 13 Oct 2017 10:48:00 -0700
+
 seqan2 (2.3.2+dfsg2-1) unstable; urgency=medium
 
   * Still not enough memory for seqan-apps on amrhf, disabling
diff --git a/debian/control b/debian/control
index 2d53b0a..32e3cdb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,17 @@ Uploaders: Andreas Tille <tille at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               cmake,
-               zlib1g-dev,
-               libbz2-dev,
-               libbam-dev,
-               libboost-dev,
-               dh-exec,
-               help2man,
-               python,
-               python-jinja2,
-               python-nose,
-               dh-linktree
+               python
+Build-Depends-Arch: cmake,
+                    zlib1g-dev,
+                    libbz2-dev,
+                    libbam-dev,
+                    libboost-dev,
+                    help2man,
+#Build-Depends-Indep: dh-exec
+#dh-linktree,
+#python-nose,
+#python-jinja2,
 #default-jdk,
 #python-sphinx,
 #python-sphinx-rtd-theme,
diff --git a/debian/rules b/debian/rules
index cc3b7c8..920eab1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ DEB_BUILD_ARCH          ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifneq (,$(filter mips mipsel,$(DEB_BUILD_ARCH)))
     export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS | sed 's/-O[1-9]//') -O1 -mxgot
 endif
-# Disable parallel building on some archs to save memory
+# Disable parallel building on some build archs to save memory
 ifneq (,$(filter armhf mips kfreebsd%,$(DEB_BUILD_ARCH)))
     $(info $$DEB_BUILD_OPTIONS was [${DEB_BUILD_OPTIONS}])
     TDBO := $(DEB_BUILD_OPTIONS)
@@ -33,11 +33,17 @@ ifneq (,$(filter armhf mips kfreebsd%,$(DEB_BUILD_ARCH)))
 endif
 $(info $$DEB_BUILD_OPTIONS is [${DEB_BUILD_OPTIONS}])
 
-# Try to save memory on kfreebsd-*
-ifneq (,$(filter kfreebsd%,$(DEB_BUILD_ARCH)))
+# Try to save memory on kfreebsd-* and hurd-i386
+ifneq (,$(filter kfreebsd% hurd%,$(DEB_BUILD_ARCH)))
 	export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS | sed 's/-O[1-9]//') -O1
 endif
 
+ifneq (,$(filter mips64el ppc64el s390x alpha hppa powerpc ppc64 sparc64,$(DEB_HOST_ARCH)))
+# Disable async io on certain target archs, as per upstream
+# https://github.com/seqan/seqan/issues/1861#issuecomment-336484553
+NOASYNC=-DCMAKE_CXX_FLAGS="-DSEQAN_ASYNC_IO=0"
+endif
+
 pkgapps=seqan-apps
 pkgdev=libseqan2-dev
 
@@ -46,7 +52,9 @@ pkgdev=libseqan2-dev
 
 override_dh_auto_configure-arch:
 	#	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS -DSEQAN_STATIC_APPS=False  # skip the tests for now
-	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=DEVELOP -DSEQAN_STATIC_APPS=False -DSEQAN_NO_DOX=1 -DSEQAN_DISABLE_VERSION_CHECK=YES
+	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=DEVELOP \
+		-DSEQAN_STATIC_APPS=False -DSEQAN_NO_DOX=1 \
+		-DSEQAN_DISABLE_VERSION_CHECK=YES $(NOASYNC)
 
 override_dh_auto_configure-indep: ;
 
@@ -110,10 +118,10 @@ override_dh_fixperms-indep:
 	done
 	find $(CURDIR)/debian/$(pkgdev)/usr/share/cmake -type f -exec chmod -x {} \;
 
-#override_dh_auto_test:
-# # Run test suite only on powerfull architectures (amd64) at build time
-# ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64))
-# 	dh_auto_test
-# else
-# 	echo "Do not run test suite when building on architecture $(DEB_HOST_ARCH)"
-# endif
+override_dh_auto_test:
+# enforce tests on some architectures
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 kfreebsd-amd64 m68k x32))
+	dh_auto_test
+else
+	dh_auto_test || /bin/true
+endif
diff --git a/debian/watch b/debian/watch
index f1ff663..6c6a96b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,compression=xz,repack" \
-  http://packages.seqan.de/ .*/seqan-src-([.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,compression=xz,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//,repack" \
+  https://github.com/seqan/seqan/releases .*/seqan-v([.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqan2.git