[med-svn] [Git][med-team/mash][master] 5 commits: Do not run build time tests parallel

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mash


Commits:
de976733 by Andreas Tille at 2019-02-07T11:59:48Z
Do not run build time tests parallel

- - - - -
3390b21c by Andreas Tille at 2019-02-07T12:22:50Z
Fix build for 32bit architectures

- - - - -
698bbde8 by Andreas Tille at 2019-02-07T12:35:19Z
debhelper 12

- - - - -
60120d69 by Andreas Tille at 2019-02-07T12:36:29Z
Standards-Version: 4.3.0

- - - - -
92b349b2 by Andreas Tille at 2019-02-07T12:39:11Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,6 @@
-mash (2.1+dfsg-1) UNRELEASED; urgency=medium
+mash (2.1+dfsg-1) unstable; urgency=medium
 
   * Team upload.
-  * Remove code copy of MurmurHash and use libmurmurhash-dev instead
-    Closes: #918566
 
   [ Steve Langasek ]
   * debian/rules: set -DARCH_32 on our 32-bit architectures, as apparently
@@ -10,7 +8,14 @@ mash (2.1+dfsg-1) UNRELEASED; urgency=medium
     whenever running on a system that disallows unaligned access.
     Closes: #919778
 
- -- Andreas Tille <tille at debian.org>  Tue, 05 Feb 2019 15:58:23 +0100
+  [ Andreas Tille ]
+  * Remove code copy of MurmurHash and use libmurmurhash-dev instead
+    Closes: #918566
+  * Do not run build time tests parallel
+  * debhelper 12
+  * Standards-Version: 4.3.0
+
+ -- Andreas Tille <tille at debian.org>  Thu, 07 Feb 2019 13:36:30 +0100
 
 mash (2.1-2) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Sascha Steinbiss <satta at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper (>= 12~),
                capnproto (>= 0.6.1),
                libcapnp-dev (>= 0.6.1),
                libgsl-dev,
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 11),
                libjs-mathjax,
                asciidoctor,
                libmurmurhash-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/mash
 Vcs-Git: https://salsa.debian.org/med-team/mash.git
 Homepage: https://mash.readthedocs.io


=====================================
debian/rules
=====================================
@@ -3,14 +3,15 @@
 # DH_VERBOSE := 1
 export LC_ALL=C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,filter(armhf i386,$(DEB_HOST_ARCH)))
+
+include /usr/share/dpkg/architecture.mk
+ifeq ($(DEB_HOST_ARCH_BITS),32)
    DEB_CPPFLAGS_MAINT_APPEND = -DARCH_32
 endif
 export DEB_CPPFLAGS_MAINT_APPEND
 
 %:
-	dh $@  --with autoreconf,sphinxdoc
+	dh $@ --with sphinxdoc
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -28,3 +29,8 @@ override_dh_installman:
 	asciidoctor -a docdate='' -b manpage $(CURDIR)/debian/man_src/*.adoc
 	cp $(CURDIR)/debian/man_src/*.? $(CURDIR)/debian/man
 	dh_installman --
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	dh_auto_test --no-parallel
+endif



View it on GitLab: https://salsa.debian.org/med-team/mash/compare/ca8d882b3a4ada4e2cd1f6c7c677a0ff6b294ded...92b349b26ff7d438550c73cf98b0b7b8f281c36c

-- 
View it on GitLab: https://salsa.debian.org/med-team/mash/compare/ca8d882b3a4ada4e2cd1f6c7c677a0ff6b294ded...92b349b26ff7d438550c73cf98b0b7b8f281c36c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190207/1a201bb4/attachment-0001.html>