[med-svn] [Git][med-team/edtsurf][master] 3 commits: Build on i386 again

[Michael R. Crusoe]

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


Commits:
f84c5567 by Michael R. Crusoe at 2021-01-28T16:46:20+01:00
Build on i386 again

- - - - -
60a7fb33 by Michael R. Crusoe at 2021-01-28T16:50:15+01:00
routine-update: Standards-Version: 4.5.1

- - - - -
05188c47 by Michael R. Crusoe at 2021-01-28T16:50:25+01:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+edtsurf (0.2009-10) unstable; urgency=medium
+
+  * Team upload.
+  * debian/rules: for i386 compile with -ffloat-store. Closes: #980441
+  * debian/test/run-unit-test: run all tests on i386
+  * Standards-Version: 4.5.1 (routine-update)
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Thu, 28 Jan 2021 16:50:25 +0100
+
 edtsurf (0.2009-9) unstable; urgency=medium
 
   * Exclude i386 from supported architectures since it fails even the


=====================================
debian/control
=====================================
@@ -6,14 +6,15 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/edtsurf
 Vcs-Git: https://salsa.debian.org/med-team/edtsurf.git
 Homepage: https://zhanglab.ccmb.med.umich.edu/EDTSurf/
 Rules-Requires-Root: no
 
 Package: edtsurf
-Architecture: any-amd64 arm64 armhf armel mips mips64el mipsel ppc64el s390x alpha hppa m68k powerpc powerpcspe ppc64 sh4 sparc64 x32
+Architecture: any
+#Architecture: any-amd64 arm64 armhf armel mips mips64el mipsel ppc64el s390x alpha hppa m68k powerpc powerpcspe ppc64 sh4 sparc64 x32
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: meshlab


=====================================
debian/rules
=====================================
@@ -4,6 +4,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+ifneq (,$(filter $(DEB_HOST_ARCH), i386))
+export DEB_CXXFLAGS_MAINT_APPEND += -ffloat-store
+endif
+
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:


=====================================
debian/tests/run-unit-test
=====================================
@@ -18,21 +18,16 @@ ls -R
 
 cd data
 
-if [ $(dpkg-architecture -qDEB_HOST_ARCH) = i386 ] ; then
-  echo "This test will timeout on i386 (see bug #974555) so do not run it here."
-else
-  echo -e "\e[93m\e[1mTest 1\e[0m"
-  EDTSurf -i 4we2.pdb
-
-  echo "5a8f743a66963e9939773cce4dd68063  4we2-cav.pdb" > checksums
-  echo "1e12bc9a1180027990d7b16497af051b  4we2.ply" >> checksums
-  md5sum --check checksums
-
-  echo -e "\e[92m\e[1mPassed\e[0m"
-  echo
-fi
+echo -e "\e[93m\e[1mTest 1\e[0m"
+EDTSurf -i 4we2.pdb
+
+echo "5a8f743a66963e9939773cce4dd68063  4we2-cav.pdb" > checksums
+echo "1e12bc9a1180027990d7b16497af051b  4we2.ply" >> checksums
+md5sum --check checksums
+
+echo -e "\e[92m\e[1mPassed\e[0m"
+echo
 
-# This test seems to make the less effort computing time wise so it should be possible on all architectures
 echo -e "\e[93m\e[1mTest 2\e[0m"
 EDTSurf -i 4we2.pdb -t 2 -o 4we2-vcmc-ms
 
@@ -43,27 +38,23 @@ md5sum --check checksums
 echo -e "\e[92m\e[1mPassed\e[0m"
 echo
 
-if [ $(dpkg-architecture -qDEB_HOST_ARCH) = i386 ] ; then
-  echo "This test will timeout on i386 (see bug #974555) so do not run it here."
-else
-  echo -e "\e[93m\e[1mTest 3\e[0m"
-  EDTSurf -i 4we2.pdb -s 1 -t 1 -o 4we2-mc-vws
+echo -e "\e[93m\e[1mTest 3\e[0m"
+EDTSurf -i 4we2.pdb -s 1 -t 1 -o 4we2-mc-vws
 
-  echo "6c58df9e481d7acc476ac49b05ccf71a  4we2-mc-vws-cav.pdb" > checksums
-  echo "3fcf6ee03320d65165f6b69829184523  4we2-mc-vws.ply" >> checksums
-  md5sum --check checksums
+echo "6c58df9e481d7acc476ac49b05ccf71a  4we2-mc-vws-cav.pdb" > checksums
+echo "3fcf6ee03320d65165f6b69829184523  4we2-mc-vws.ply" >> checksums
+md5sum --check checksums
 
-  echo -e "\e[92m\e[1mPassed\e[0m"
-  echo
+echo -e "\e[92m\e[1mPassed\e[0m"
+echo
 
-  echo -e "\e[93m\e[1mTest 4\e[0m"
-  EDTSurf -i 4we2.pdb -s 2 -t 2 -c 3 -o 4we2-sas-vcmc-chain
+echo -e "\e[93m\e[1mTest 4\e[0m"
+EDTSurf -i 4we2.pdb -s 2 -t 2 -c 3 -o 4we2-sas-vcmc-chain
 
-  echo "e53d8f051ab37ddb2e8ea7f91b576046  4we2-sas-vcmc-chain.asa" > checksums
-  echo "a5c9f8506b7a19598abdd4d723b659d8  4we2-sas-vcmc-chain-cav.pdb" >> checksums
-  echo "840499d9781b146e0144fdb597c73a8e  4we2-sas-vcmc-chain.ply" >> checksums
-  md5sum --check checksums
+echo "e53d8f051ab37ddb2e8ea7f91b576046  4we2-sas-vcmc-chain.asa" > checksums
+echo "a5c9f8506b7a19598abdd4d723b659d8  4we2-sas-vcmc-chain-cav.pdb" >> checksums
+echo "840499d9781b146e0144fdb597c73a8e  4we2-sas-vcmc-chain.ply" >> checksums
+md5sum --check checksums
 
-  echo -e "\e[92m\e[1mPassed\e[0m"
-  echo
-fi
+echo -e "\e[92m\e[1mPassed\e[0m"
+echo



View it on GitLab: https://salsa.debian.org/med-team/edtsurf/-/compare/5d87ff2557379f87b19f5fdcaaa73756d06a9325...05188c47ab17fab0ba2ec9428483bf77fcdcf13e

-- 
View it on GitLab: https://salsa.debian.org/med-team/edtsurf/-/compare/5d87ff2557379f87b19f5fdcaaa73756d06a9325...05188c47ab17fab0ba2ec9428483bf77fcdcf13e
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/20210128/f7d672b0/attachment-0001.html>