Andreas Tille pushed to branch debian/master at Debian Med / ciftilib
Commits: f2783b64 by Andreas Tille at 2020-01-11T18:02:59+01:00 FTBFS with Boost 1.71 - - - - - 80227ead by Andreas Tille at 2020-01-11T18:03:18+01:00 routine-update: debhelper-compat 12 - - - - - 7f850b2a by Andreas Tille at 2020-01-11T18:03:25+01:00 routine-update: Standards-Version: 4.4.1 - - - - - e2c96065 by Andreas Tille at 2020-01-11T18:03:26+01:00 Remove obsolete field Name from debian/upstream/metadata (already present in machine-readable debian/copyright). - - - - - 2eff4fdc by Andreas Tille at 2020-01-11T18:04:53+01:00 routine-update: Ready to upload to unstable - - - - - 6 changed files: - debian/changelog - − debian/compat - debian/control - + debian/patches/0002-Fix-compilation-with-Boost-1.71.patch - debian/patches/series - debian/upstream/metadata Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +ciftilib (1.5.3-3) unstable; urgency=medium + + * Team upload. + * FTBFS with Boost 1.71 + Closes: #948665 + * debhelper-compat 12 + * Standards-Version: 4.4.1 + * Remove obsolete field Name from debian/upstream/metadata (already + present in machine-readable debian/copyright). + + -- Andreas Tille <[email protected]> Sat, 11 Jan 2020 18:03:26 +0100 + ciftilib (1.5.3-2) unstable; urgency=medium * gbp.conf: drop pq settings ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -12 ===================================== debian/control ===================================== @@ -4,13 +4,13 @@ Uploaders: Ghislain Antony Vaillant <[email protected]> Section: libs Priority: optional Build-Depends: cmake, - debhelper (>= 12~), + debhelper-compat (= 12), libboost-dev, libboost-filesystem-dev, libxml++2.6-dev, zlib1g-dev Build-Depends-Indep: doxygen -Standards-Version: 4.3.0 +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/med-team/ciftilib Vcs-Git: https://salsa.debian.org/med-team/ciftilib.git Homepage: https://github.com/Washington-University/CiftiLib ===================================== debian/patches/0002-Fix-compilation-with-Boost-1.71.patch ===================================== @@ -0,0 +1,32 @@ +From: Giovanni Mascellani <[email protected]> +Date: Sat, 11 Jan 2020 15:44:14 +0100 +Bug-Debian: https://bugs.debian.org/948665 +Subject: Fix compilation with Boost 1.71. + +Method file_string() is now obsolete and just calls string(). +--- + src/CiftiFile.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CiftiFile.cxx b/src/CiftiFile.cxx +index 9bbb16d..6b15311 100644 +--- a/src/CiftiFile.cxx ++++ b/src/CiftiFile.cxx +@@ -100,7 +100,7 @@ namespace + return QFileInfo(mypath).absoluteFilePath(); + #else + #ifdef CIFTILIB_BOOST_NO_FSV3 +- return filesystem::complete(AString_to_std_string(mypath)).file_string(); ++ return filesystem::complete(AString_to_std_string(mypath)).string(); + #else + return filesystem::absolute(AString_to_std_string(mypath)).native(); + #endif +@@ -113,7 +113,7 @@ namespace + return QFileInfo(mypath).canonicalFilePath(); + #else + #ifdef CIFTILIB_BOOST_NO_FSV3 +- return filesystem::complete(AString_to_std_string(mypath)).file_string(); ++ return filesystem::complete(AString_to_std_string(mypath)).string(); + #else + #ifdef CIFTILIB_BOOST_NO_CANONICAL + filesystem::path temp = AString_to_std_string(mypath); ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 0001-force-endian-of-datatype-example-to-make-tests-pass-.patch +0002-Fix-compilation-with-Boost-1.71.patch ===================================== debian/upstream/metadata ===================================== @@ -1,5 +1,4 @@ Bug-Database: https://github.com/Washington-University/CiftiLib/issues Bug-Submit: https://github.com/Washington-University/CiftiLib/issues/new -Name: CiftiLib Repository: [email protected]:Washington-University/CiftiLib Repository-Browse: https://github.com/Washington-University/CiftiLib View it on GitLab: https://salsa.debian.org/med-team/ciftilib/compare/309e4e30435b68aea5936cca0e9050d7afa4879f...2eff4fdcf283d343276a1303d4695b2529ef9a54 -- View it on GitLab: https://salsa.debian.org/med-team/ciftilib/compare/309e4e30435b68aea5936cca0e9050d7afa4879f...2eff4fdcf283d343276a1303d4695b2529ef9a54 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
