[med-svn] [seqan2] 03/03: Testing upstream's 3rd formal release candidate for 2.4.0

[Michael Crusoe]

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

misterc-guest pushed a commit to tag debian/2.4.0_rc2+dfsg-1
in repository seqan2.

commit 7e3cc84abb00d807922e5f11cecd32c941be7224
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Wed Jan 31 08:49:30 2018 -0800

    Testing upstream's 3rd formal release candidate for 2.4.0
---
 debian/changelog                |  7 +++++++
 debian/rules                    | 20 +++++++-------------
 debian/source/lintian-overrides |  4 ----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c61044..e539765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+seqan2 (2.4.0~rc2+dfsg-1) experimental; urgency=medium
+
+  * Testing upstream's 3rd formal release candidate for 2.4.0
+  * debian/rules: use --max-parallel to more cleanly limit parallel building
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 31 Jan 2018 22:23:03 -0800
+
 seqan2 (2.4.0~rc1+dfsg-2) experimental; urgency=medium
 
   * debian/rules: Drop amd64, mips, mipsel to -j3 to save memory
diff --git a/debian/rules b/debian/rules
index cdcdbe4..7510afc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,19 +23,13 @@ endif
 ifneq (,$(filter mips mipsel mips64el,$(DEB_BUILD_ARCH)))
     DEB_CXXFLAGS_MAINT_APPEND+=-mxgot
 endif
-# Disable parallel building on some build archs to save memory
+MAX_PARALLEL=""
+# Disable or limit parallel building on some build archs to save memory
 ifneq (,$(filter armel armhf sh4 kfreebsd% powerpcspe,$(DEB_BUILD_ARCH)))
-    $(info $$DEB_BUILD_OPTIONS was [${DEB_BUILD_OPTIONS}])
-    TDBO := $(DEB_BUILD_OPTIONS)
-    DEB_BUILD_OPTIONS=parallel=1,$(filter $(TDBO), parallel)
-    undefine TDBO
-else (,$(filter amd64 mips mipsel,$(DEB_BUILD_ARCH)))
-    $(info $$DEB_BUILD_OPTIONS was [${DEB_BUILD_OPTIONS}])
-    TDBO := $(DEB_BUILD_OPTIONS)
-    DEB_BUILD_OPTIONS=parallel=3,$(filter $(TDBO), parallel)
-    undefine TDBO
+	MAX_PARALLEL=--max-parallel=1
+else ifneq (,$(filter amd64 mips mipsel,$(DEB_BUILD_ARCH)))
+	MAX_PARALLEL=--max-parallel=3
 endif
-$(info $$DEB_BUILD_OPTIONS is [${DEB_BUILD_OPTIONS}])
 
 # ifneq (,$(filter mips64el ppc64el s390x alpha hppa powerpc ppc64 sparc64,$(DEB_HOST_ARCH)))
 # # Disable async io on certain target archs, as per upstream
@@ -46,7 +40,7 @@ $(info $$DEB_BUILD_OPTIONS is [${DEB_BUILD_OPTIONS}])
 # As per upstream's instructions
 DEB_CXXFLAGS_MAINT_APPEND+=-DNDEBUG -O3
 export DEB_CFLAGS_MAINT_APPEND+=-O3
-export DEB_CXXFLAGS_MAINT_APPEND DEB_CFLAGS_MAINT_APPEND DEB_BUILD_OPTIONS
+export DEB_CXXFLAGS_MAINT_APPEND DEB_CFLAGS_MAINT_APPEND
 
 pkgapps=seqan-apps
 pkgdev=libseqan2-dev
@@ -63,7 +57,7 @@ override_dh_auto_configure-arch:
 override_dh_auto_configure-indep: ;
 
 override_dh_auto_build-arch:
-	dh_auto_build --arch
+	dh_auto_build --arch ${MAX_PARALLEL}
 	#cd obj-$(DEB_BUILD_GNU_TYPE); make dox # FIXME: This does nothing and no *.html files will be created at all
 	# This ends up in:
 	# Could not import extension sphinxcontrib.bibtex (exception: No module named sphinxcontrib.bibtex)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index a4b8807..534fd19 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,7 +1,3 @@
-# We override parallel building on some archs
-seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 30
-seqan2 source: debian-rules-sets-DEB_BUILD_OPTIONS line 35
-
 # False positive, dh-exec is used by the docs package which is currently
 # disabled
 seqan2 source: package-uses-dh-exec-but-lacks-build-depends

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