Andreas Tille pushed to branch master at Debian Med / tree-puzzle
Commits: c3548b3b by Andreas Tille at 2020-04-19T18:07:07+02:00 Fix FTBFS due to the new MPI-3.0 API - - - - - c25c4a81 by Andreas Tille at 2020-04-19T18:07:19+02:00 routine-update: Standards-Version: 4.5.0 - - - - - c5597c73 by Andreas Tille at 2020-04-19T18:07:19+02:00 routine-update: debhelper-compat 12 - - - - - b7100793 by Andreas Tille at 2020-04-19T18:07:22+02:00 routine-update: Secure URI in copyright format - - - - - 678afc1f by Andreas Tille at 2020-04-19T18:07:52+02:00 routine-update: DEB_BUILD_OPTIONS allow override_dh_auto_test - - - - - 8f278129 by Andreas Tille at 2020-04-19T18:07:52+02:00 routine-update: Add salsa-ci file - - - - - 159aa18e by Andreas Tille at 2020-04-19T18:07:52+02:00 routine-update: Rules-Requires-Root: no - - - - - a90aa82b by Andreas Tille at 2020-04-19T18:11:22+02:00 Cleanup changelog - - - - - 8 changed files: - debian/changelog - − debian/compat - debian/control - debian/copyright - + debian/patches/fix-mpi3-build.patch - debian/patches/series - debian/rules - + debian/salsa-ci.yml Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,20 @@ tree-puzzle (5.3~rc16+dfsg-1) UNRELEASED; urgency=medium + [ Andreas Tille ] * New upstream pre-release * Install test suite into examples package * Remove code copy of sprng from source package + * Standards-Version: 4.5.0 (routine-update) + * debhelper-compat 12 (routine-update) + * Secure URI in copyright format (routine-update) + * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine- + update) + * Add salsa-ci file (routine-update) + * Rules-Requires-Root: no (routine-update) + + [ Alberto Garcia ] + * debian/patches/fix-mpi3-build.patch: + - Fix FTBFS due to the new MPI-3.0 API (Closes: #951984). -- Andreas Tille <[email protected]> Mon, 08 Jul 2019 16:47:12 +0200 ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -4,13 +4,14 @@ Uploaders: Andreas Tille <[email protected]>, Charles Plessy <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), libopenmpi-dev, libsprng2-dev -Standards-Version: 4.2.1 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/med-team/tree-puzzle Vcs-Git: https://salsa.debian.org/med-team/tree-puzzle.git Homepage: http://www.tree-puzzle.de +Rules-Requires-Root: no Package: tree-puzzle Architecture: any ===================================== debian/copyright ===================================== @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: TREE-PUZZLE Upstream-Contact: Heiko A. Schmidt <[email protected]> Source: http://www.tree-puzzle.de ===================================== debian/patches/fix-mpi3-build.patch ===================================== @@ -0,0 +1,20 @@ +From: Alberto Garcia <[email protected]> +Subject: Replace obsolete MPI-2.0 API with their MPI-3.0 equivalents +Bug-Debian: https://bugs.debian.org/951984 +--- a/src/ppuzzle.c ++++ b/src/ppuzzle.c +@@ -21,11 +21,14 @@ + #endif + + #define EXTERN extern ++#define OMPI_OMIT_MPI1_COMPAT_DECLS 1 + + #include <mpi.h> + #include <time.h> + #include "ppuzzle.h" + ++#define MPI_Address MPI_Get_address ++#define MPI_Type_struct MPI_Type_create_struct + + int PP_IamMaster; + int PP_IamSlave; ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ use_debian_packaged_sprng.patch tests-need-bash.patch spelling.patch +fix-mpi3-build.patch ===================================== debian/rules ===================================== @@ -20,11 +20,13 @@ override_dh_install-arch: mv `pwd`/debian/tmp/usr/bin/ppuzzle `pwd`/debian/$(ppkg)/usr/bin/$(ppkg) override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # unfortunately most tests are failing for the moment # the issue is documented in # debian/patches/patch_test_results.patch # and needs to be discussed with upstream dh_auto_test || true +endif override_dh_installexamples: rm -f tests/*.log tests/*.trs ===================================== debian/salsa-ci.yml ===================================== @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml View it on GitLab: https://salsa.debian.org/med-team/tree-puzzle/-/compare/7b5ed75af4be8e7b42b929989fc2222c124102f8...a90aa82b5136f68a67036fc6f9373dfb42f9f53c -- View it on GitLab: https://salsa.debian.org/med-team/tree-puzzle/-/compare/7b5ed75af4be8e7b42b929989fc2222c124102f8...a90aa82b5136f68a67036fc6f9373dfb42f9f53c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
