[med-svn] [Git][med-team/bcftools][master] 2 commits: skip i386 due to lack of tabix/libhts

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / bcftools


Commits:
af239313 by Michael R. Crusoe at 2019-08-06T16:46:10Z
skip i386 due to lack of tabix/libhts

- - - - -
2d799163 by Michael R. Crusoe at 2019-08-06T17:32:45Z
don't parallelize the tests

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,13 @@
-bcftools (1.9-2) UNRELEASED; urgency=medium
+bcftools (1.9-2) unstable; urgency=medium
 
   * Team upload.
   * Remove now-unneeded lintian-override
-  * Reduce test failures on i386 from 113 to 18 by compiling with -msse
-    and -mfpmath=sse
+  * Remove i386 as libhts/tabix has dropped it
+  * Temporarily disable failing plugins tests
   * Remove trailing whitespace in debian/copyright
   * Standards-Version: 4.3.0, no changes needed
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 16 Jan 2019 01:18:22 -0800
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Tue, 06 Aug 2019 19:32:16 +0200
 
 bcftools (1.9-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Vcs-Git: https://salsa.debian.org/med-team/bcftools.git
 Homepage: http://samtools.github.io/bcftools/
 
 Package: bcftools
-Architecture: any
+Architecture: any-amd64 arm64 armel armhf mips mips64el mipsel ppc64el s390x alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${perl:Depends}


=====================================
debian/rules
=====================================
@@ -2,9 +2,6 @@
 
 #export DH_VERBOSE = 1
 #include /usr/share/dpkg/default.mk
-ifneq (,$(filter $(DEB_HOST_ARCH),i386 kfreebsd-i386 hurd-i386))
-  export DEB_CFLAGS_MAINT_APPEND=-msse -mfpmath=sse
-endif
 
 %:
 	dh $@
@@ -40,3 +37,8 @@ override_dh_install:
 	for pscript in `grep -Rl '#!/usr/bin/env \+perl' debian/*` ; do \
 	    sed -i '1s?#!/usr/bin/env \+perl?#!/usr/bin/perl?' $${pscript} ; \
 	done
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	make test-no-plugins VERBOSE=1
+endif


=====================================
debian/tests/control
=====================================
@@ -1,9 +1,8 @@
 Test-Command:
-	ln -s /usr/bin/bcftools bcftools &&
+	mv -f bcftools bcftools.orig || /bin/true; ln -s /usr/bin/bcftools bcftools &&
 	./test/test.pl
-	--plugins
 	--exec bgzip=/usr/bin/bgzip
-	--exec tabix=/usr/bin/tabix
+	--exec tabix=/usr/bin/tabix  && mv -f bcftools.orig bcftools
 Depends:
 	@,
 	tabix,



View it on GitLab: https://salsa.debian.org/med-team/bcftools/compare/2195caeaaa363f4c308bb018e568fbe17607b0c4...2d79916316c5e451e6ba5aa3838b954d3ca3299d

-- 
View it on GitLab: https://salsa.debian.org/med-team/bcftools/compare/2195caeaaa363f4c308bb018e568fbe17607b0c4...2d79916316c5e451e6ba5aa3838b954d3ca3299d
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/20190806/4fde66a2/attachment-0001.html>