Pierre Gruet pushed to branch master at Debian Med / libgtextutils
Commits: 69a34cb2 by Pierre Gruet at 2020-07-28T22:45:11+02:00 Adding (C++ filtered) symbols file - - - - - a7f82ccf by Pierre Gruet at 2020-07-28T22:45:37+02:00 Replacing tabs by spaces in debian/copyright - - - - - 81f60623 by Pierre Gruet at 2020-07-28T22:46:25+02:00 Depending on debhelper-compat - - - - - 9d5a1dee by Pierre Gruet at 2020-07-28T22:48:46+02:00 Bumping Standards version to 4.5.0 (Rules-Requires-Root field added) - - - - - 51203dbd by Pierre Gruet at 2020-07-28T22:52:49+02:00 Adding file salsa-ci.yml - - - - - 29dcecce by Pierre Gruet at 2020-07-29T17:30:35+02:00 Fixing ambiguity introduced with C++11 - - - - - 571923c9 by Pierre Gruet at 2020-07-29T17:31:03+02:00 Adding Forwarded header in patches - - - - - 6e774ec0 by Pierre Gruet at 2020-07-29T17:31:18+02:00 Preparing upload - - - - - 10 changed files: - debian/changelog - − debian/compat - debian/control - debian/copyright - + debian/libgtextutils0v5.symbols - debian/patches/enable_parallel_tests.patch - + debian/patches/fixing_implicit_conversion.patch - debian/patches/gcc-6.patch - debian/patches/series - + debian/salsa-ci.yml Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +libgtextutils (0.7-7) UNRELEASED; urgency=medium + + * Removing an operator leading to ambiguous affectations (Closes: #925745) + * Adding (C++ filtered) symbols file + * Replacing tabs by spaces in debian/copyright + * Bumping Standards version to 4.5.0 (Rules-Requires-Root field added) + + -- Pierre Gruet <[email protected]> Tue, 28 Jul 2020 22:55:06 +0200 + libgtextutils (0.7-6) unstable; urgency=medium [ Frédéric Bonnard ] ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -1,16 +1,18 @@ Source: libgtextutils Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Charles Plessy <[email protected]>, - Andreas Tille <[email protected]> + Andreas Tille <[email protected]>, + Pierre Gruet <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 13), dh-exec, libtool -Standards-Version: 4.2.1 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/med-team/libgtextutils Vcs-Git: https://salsa.debian.org/med-team/libgtextutils.git Homepage: http://hannonlab.cshl.edu/fastx_toolkit/ +Rules-Requires-Root: no Package: libgtextutils-dev Architecture: any ===================================== debian/copyright ===================================== @@ -32,14 +32,14 @@ Copyright: © 1999 Nicolai M. Josuttis License: AGPL-3+ and other License: AGPL-3+ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 . Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. . - Preamble + Preamble . The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure @@ -90,7 +90,7 @@ License: AGPL-3+ The precise terms and conditions for copying, distribution and modification follow. . - TERMS AND CONDITIONS + TERMS AND CONDITIONS . 0. Definitions. . @@ -650,9 +650,9 @@ License: AGPL-3+ Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. . - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS . - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs . If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it ===================================== debian/libgtextutils0v5.symbols ===================================== @@ -0,0 +1,14 @@ +libgtextutils-0.7.so.0 libgtextutils0v5 #MINVER# +* Build-Depends-Package: libgtextutils-dev + (c++)"TextLineReader::next_line()@Base" 0.7 + (c++)"TextLineReader::TextLineReader(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.7 + (c++)"TextLineReader::TextLineReader(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.7 + (c++)"InputStreamWrapper::InputStreamWrapper(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.7 + (c++)"InputStreamWrapper::InputStreamWrapper(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.7 + (c++)"OutputStreamWrapper::OutputStreamWrapper(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.7 + (c++)"OutputStreamWrapper::OutputStreamWrapper(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.7 + pipe_close@Base 0.7 + pipe_input_command@Base 0.7 + pipe_output_command@Base 0.7 + strnatcasecmp@Base 0.7 + strnatcmp@Base 0.7 ===================================== debian/patches/enable_parallel_tests.patch ===================================== @@ -3,6 +3,7 @@ Last-Update: Fri Nov 23 13:45:51 2018 +0100 Bug-Debian: https://bugs.debian.org/914438 Description: preserves parallel testing while making sure it does not fail on ppc64el (and may be other architectures) +Forwarded: not-needed --- a/tests/Makefile.am +++ b/tests/Makefile.am ===================================== debian/patches/fixing_implicit_conversion.patch ===================================== @@ -0,0 +1,19 @@ +Description: Suppressing overload issue due to references on rvalues + C++11 introduced references on rvalues, and thus the two implicit conversion + operators to std::string caused ambiguous conversions, for instance in + tests/test_text_reader/cpp. +Author: Pierre Gruet <[email protected]> +Bug: https://bugs.debian.org/925745 +Forwarded: https://github.com/agordon/libgtextutils/issues/15 +Last-Update: 2020-07-28 + +--- a/src/gtextutils/text_line_reader.h ++++ b/src/gtextutils/text_line_reader.h +@@ -54,7 +54,6 @@ + + //implicit conversions + operator const std::string& () const { return line_string() ; } +- operator std::string() const { return line_string(); } + operator std::istream& () { return line_stream(); } + + }; ===================================== debian/patches/gcc-6.patch ===================================== @@ -2,6 +2,7 @@ From: Gert Wollny <[email protected]> Date: Wed, 29 Jun 2014 16:47:43 +0200 Subject: Fix compilation with g++-6 Bug-Debian: https://bugs.debian.org/811646 +Forwarded: https://github.com/agordon/libgtextutils/issues/14 --- a/src/gtextutils/text_line_reader.cpp +++ b/src/gtextutils/text_line_reader.cpp ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ gcc-6.patch enable_parallel_tests.patch +fixing_implicit_conversion.patch ===================================== 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/libgtextutils/-/compare/1c2422a0eed0e6f10bc4d41c158e59e98a0b0f20...6e774ec04a950db07bf05e85c1cc9384198c8c07 -- View it on GitLab: https://salsa.debian.org/med-team/libgtextutils/-/compare/1c2422a0eed0e6f10bc4d41c158e59e98a0b0f20...6e774ec04a950db07bf05e85c1cc9384198c8c07 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
