Andreas Tille pushed to branch master at Debian Med / prime-phylo
Commits: 7edf3568 by Andreas Tille at 2018-05-22T14:12:35+02:00 'beep::' is redundant inside 'namespace beep' block - - - - - 4d6a6f0d by Andreas Tille at 2018-05-22T14:13:27+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - − debian/patches/fix-gcc-6.patch - + debian/patches/fix-gcc-8.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +prime-phylo (1.0.11-6) unstable; urgency=medium + + [ Juhani Numminen ] + * 'beep::' is redundant inside 'namespace beep' block + Closes: #897837 + + -- Andreas Tille <[email protected]> Tue, 22 May 2018 14:12:53 +0200 + prime-phylo (1.0.11-5) unstable; urgency=medium [ Andreas Tille ] ===================================== debian/patches/fix-gcc-6.patch deleted ===================================== --- a/debian/patches/fix-gcc-6.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: fix building with GCC 6 - This patch adds support for GCC 6 by forcing an older C++ standard - other than the one used by default now. - This also bumps CMake version level used to 3.1, which also required some - extra adjustment due to https://cmake.org/cmake/help/v3.0/policy/CMP0026.html. -Author: Sascha Steinbiss <[email protected]> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Level: trunk/CMakeLists.txt - ################################################ - --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.1) - project(prime-phylo CXX) - - SET(CMAKE_BUILD_TYPE Debug) -@@ -14,6 +14,7 @@ - set(PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) - set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PACKAGE_VERSION}) - set(CPACK_GENERATOR RPM;DEB) -+set(CMAKE_CXX_STANDARD 98) - - set(tmp_man_pages_dir ${CMAKE_BINARY_DIR}/tmp_manpages) - -@@ -132,4 +133,4 @@ - file(MAKE_DIRECTORY "${vagrantdir}") - configure_file(excluded_from_release/packaging/debian/Vagrantfile.cmake "${vagrant_dir}/Vagrantfile" @ONLY) - configure_file(excluded_from_release/packaging/debian/provision.sh.cmake "${vagrant_dir}/provision.sh" @ONLY) --endif() -\ No newline at end of file -+endif() ---- a/src/cxx/CMakeLists.txt -+++ b/src/cxx/CMakeLists.txt -@@ -363,7 +363,7 @@ - #=========================================================================== - - macro(prime_add_tests tests_dir) -- get_target_property(program_exe ${programname_of_this_subdir} LOCATION) -+ get_target_property(program_exe ${programname_of_this_subdir} $<TARGET_FILE>) - file(GLOB tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${tests_dir}/test*[^~]) - foreach(i ${tests}) - get_filename_component(test ${i} NAME) ===================================== debian/patches/fix-gcc-8.patch ===================================== --- /dev/null +++ b/debian/patches/fix-gcc-8.patch @@ -0,0 +1,22 @@ +Description: 'beep::' is redundant inside 'namespace beep' block + Fixes FTBFS with GCC 8: PrimeOptionMap.hh:162:33: error: + 'std::ostream& beep::operator<<(std::ostream&, const beep::PrimeOptionMap&)' + should have been declared inside 'beep' +Author: Juhani Numminen <[email protected]> +Bug-Debian: https://bugs.debian.org/897837 +Last-Update: 2018-05-22 +--- a/src/cxx/libraries/prime/PrimeOptionMap.hh ++++ b/src/cxx/libraries/prime/PrimeOptionMap.hh +@@ -158,9 +158,9 @@ + bool parseOptions(int& argIndex, int argc, char **argv); + + //! IO +- friend std::ostream& beep::operator<<(std::ostream& o, ++ friend std::ostream& operator<<(std::ostream& o, + const PrimeOptionMap& pom); +- friend std::ostream& beep::operator<<(std::ostream& o, ++ friend std::ostream& operator<<(std::ostream& o, + const PrimeOption& po); + static std::string formatMessage(std::string opt, std::string usageText); + + ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ # fix-gcc-6.patch fix-ftbfs-with-Boost160.patch +fix-gcc-8.patch View it on GitLab: https://salsa.debian.org/med-team/prime-phylo/compare/acdee466e36999f743c4f52a456c71a62dcc482b...4d6a6f0da858de54ff8f3fdb398c5d7e18315b82 --- View it on GitLab: https://salsa.debian.org/med-team/prime-phylo/compare/acdee466e36999f743c4f52a456c71a62dcc482b...4d6a6f0da858de54ff8f3fdb398c5d7e18315b82 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
