Andreas Tille pushed to branch master at Debian Med / minia
Commits: 1b9ccfa8 by Andreas Tille at 2021-11-12T09:34:31+01:00 Do not embed kernel version in binary to enable reproducible builds - - - - - 2e5c126e by Andreas Tille at 2021-11-12T09:34:59+01:00 Fix watchfile to detect new versions on github - - - - - fe5c00a6 by Andreas Tille at 2021-11-12T09:35:02+01:00 New upstream version 3.2.6 - - - - - 39e57cde by Andreas Tille at 2021-11-12T09:35:02+01:00 routine-update: New upstream version - - - - - 00c3dc61 by Andreas Tille at 2021-11-12T09:35:07+01:00 Update upstream source from tag 'upstream/3.2.6' Update to upstream version '3.2.6' with Debian dir e7054e9f9c4aef5a392cfc46166f9b35eef87a50 - - - - - 78e4ed54 by Andreas Tille at 2021-11-12T09:35:07+01:00 routine-update: Standards-Version: 4.6.0 - - - - - 0acf1614 by Andreas Tille at 2021-11-12T09:36:42+01:00 routine-update: Ready to upload to unstable - - - - - 9 changed files: - CMakeLists.txt - debian/changelog - debian/control - + debian/patches/0001-build_info.hpp.in-Patch-to-use-CMAKE_SYSTEM_NAME-ins.patch - debian/patches/series - debian/watch - scripts/jenkins/tool-minia-build-debian7-64bits-gcc-4.7.sh - scripts/jenkins/tool-minia-build-macos-10.9.5-gcc-4.2.1.sh - scripts/jenkins/tool-minia-release-debian.sh Changes: ===================================== CMakeLists.txt ===================================== @@ -8,7 +8,7 @@ cmake_minimum_required (VERSION 2.6) # The default version number is the latest official build SET (gatb-tool_VERSION_MAJOR 3) SET (gatb-tool_VERSION_MINOR 2) -SET (gatb-tool_VERSION_PATCH 4) +SET (gatb-tool_VERSION_PATCH 5) # But, it is possible to define another release number during a local build IF (DEFINED MAJOR) ===================================== debian/changelog ===================================== @@ -1,13 +1,22 @@ -minia (3.2.4-1) UNRELEASED; urgency=medium +minia (3.2.6-1) unstable; urgency=medium - * Team upload. + [ Steffen Moeller ] * New upstream version * debhelper-compat 13 (routine-update) * Adjusted build dependencies to patched version of gatb 1.4.2 * d/rules - improved clean * d/watch - using regular releases again (up from 3.2.1 to 3.2.4) - -- Steffen Moeller <[email protected]> Mon, 10 Aug 2020 19:16:26 +0200 + [ Vagrant Cascadian ] + * Do not embed kernel version in binary to enable reproducible builds + Closes: #998420 + + [ Andreas Tille ] + * Fix watchfile to detect new versions on github + * New upstream version + * Standards-Version: 4.6.0 (routine-update) + + -- Andreas Tille <[email protected]> Fri, 12 Nov 2021 09:35:16 +0100 minia (3.2.1+git20200522.4960a99-1) unstable; urgency=medium ===================================== debian/control ===================================== @@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13), libboost-dev, libgatbcore-dev (>= 1.4.2-7), libhdf5-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/med-team/minia Vcs-Git: https://salsa.debian.org/med-team/minia.git Homepage: http://minia.genouest.org/ ===================================== debian/patches/0001-build_info.hpp.in-Patch-to-use-CMAKE_SYSTEM_NAME-ins.patch ===================================== @@ -0,0 +1,23 @@ +From: Vagrant Cascadian <[email protected]> +Date: Wed, 3 Nov 2021 21:11:32 +0000 +Bug-Debian: https://bugs.debian.org/998420 +Subject: [PATCH] build_info.hpp.in: Patch to use CMAKE_SYSTEM_NAME instead + of CMAKE_SYSTEM. + +CMAKE_SYSTEM captures the kernel version, which can reasonably vary +between builds. Use CMAKE_SYSTEM_NAME instead, which does not include +the version. + +https://tests.reproducible-builds.org/debian/issues/unstable/captures_kernel_version_via_CMAKE_SYSTEM_issue.html +--- + src/build_info.hpp.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/build_info.hpp.in ++++ b/src/build_info.hpp.in +@@ -23,4 +23,4 @@ + #define STR_MINIA_VERSION "${gatb-tool-version}" + #define STR_MINIA_COMPILATION_FLAGS "${gatb-core-flags}" + #define STR_MINIA_COMPILER "${CMAKE_C_COMPILER} (${CMAKE_CXX_COMPILER_VERSION})" +-#define STR_MINIA_OPERATING_SYSTEM "${CMAKE_SYSTEM}" ++#define STR_MINIA_OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}" ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ no_install_to_wrong_dir.patch skip-rpath.patch fix_path_in_tests.patch 2to3.patch +0001-build_info.hpp.in-Patch-to-use-CMAKE_SYSTEM_NAME-ins.patch ===================================== debian/watch ===================================== @@ -1,6 +1,6 @@ version=4 -https://github.com/GATB/minia/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz) +https://github.com/GATB/minia/releases .*/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz) # Once upon a time, the released version was not compatible with gatb-core 1.4.1+git20191130.664696c+dfsg # That is why we sticked to latest Git commit back then. ===================================== scripts/jenkins/tool-minia-build-debian7-64bits-gcc-4.7.sh ===================================== @@ -106,5 +106,8 @@ if [ $? -eq 0 ] && [ "$INRIA_FORGE_LOGIN" != none ] && [ "$DO_NOT_STOP_AT_ERROR" make package scp ${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Linux.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria # source package is handled by the osx task + # ... not anymore since I disabled osx + make package_source + scp ${TOOL_NAME}-${BRANCH_TO_BUILD}-Source.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria fi ===================================== scripts/jenkins/tool-minia-build-macos-10.9.5-gcc-4.2.1.sh ===================================== @@ -103,8 +103,8 @@ fi # Prepare and upload bin and source bundle to the forge if [ $? -eq 0 ] && [ "$INRIA_FORGE_LOGIN" != none ] && [ "$DO_NOT_STOP_AT_ERROR" != true ]; then make package - make package_source + #make package_source # putting this in debian instead scp ${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria - scp ${TOOL_NAME}-${BRANCH_TO_BUILD}-Source.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria + #scp ${TOOL_NAME}-${BRANCH_TO_BUILD}-Source.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria fi ===================================== scripts/jenkins/tool-minia-release-debian.sh ===================================== @@ -95,7 +95,7 @@ git clone https://github.com/pgdurand/github-release-api.git scp ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria/${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Linux.tar.gz . [ $? != 0 ] && exit 1 scp ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria/${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz . -[ $? != 0 ] && exit 1 +#[ $? != 0 ] && exit 1 # disabled because mavericks machine is down in 2021 scp ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-tools/htdocs/ci-inria/${TOOL_NAME}-${BRANCH_TO_BUILD}-Source.tar.gz . [ $? != 0 ] && exit 1 @@ -122,7 +122,7 @@ function uploadFile(){ } uploadFile ${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Linux.tar.gz -uploadFile ${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz +#uploadFile ${TOOL_NAME}-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz uploadFile ${TOOL_NAME}-${BRANCH_TO_BUILD}-Source.tar.gz View it on GitLab: https://salsa.debian.org/med-team/minia/-/compare/e30eaf4e8d414d7080712ce424c266f8ece3bdfd...0acf161411d20c271171da357f9b4544228847b6 -- View it on GitLab: https://salsa.debian.org/med-team/minia/-/compare/e30eaf4e8d414d7080712ce424c266f8ece3bdfd...0acf161411d20c271171da357f9b4544228847b6 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
