diff -Nru libgtextutils-0.7/debian/changelog libgtextutils-0.7/debian/changelog --- libgtextutils-0.7/debian/changelog 2020-03-22 15:45:55.000000000 +0000 +++ libgtextutils-0.7/debian/changelog 2020-07-28 20:55:06.000000000 +0000 @@ -1,8 +1,17 @@ -libgtextutils (0.7-6build1) focal; urgency=medium +libgtextutils (0.7-7) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + [ Pierre Gruet ] + * 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) - -- Matthias Klose Sun, 22 Mar 2020 16:45:55 +0100 + [ Andreas Tille ] + * Remove redundant debian/gbp.conf + * Include static lib into -dev package + * Remove *.la file from debian/tmp to keep dh_missing happy + + -- Pierre Gruet Tue, 28 Jul 2020 22:55:06 +0200 libgtextutils (0.7-6) unstable; urgency=medium diff -Nru libgtextutils-0.7/debian/compat libgtextutils-0.7/debian/compat --- libgtextutils-0.7/debian/compat 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libgtextutils-0.7/debian/control libgtextutils-0.7/debian/control --- libgtextutils-0.7/debian/control 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/control 2020-07-28 20:55:06.000000000 +0000 @@ -1,16 +1,18 @@ Source: libgtextutils Maintainer: Debian Med Packaging Team Uploaders: Charles Plessy , - Andreas Tille + Andreas Tille , + Pierre Gruet 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 diff -Nru libgtextutils-0.7/debian/copyright libgtextutils-0.7/debian/copyright --- libgtextutils-0.7/debian/copyright 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/copyright 2020-07-28 20:55:06.000000000 +0000 @@ -32,14 +32,14 @@ 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. 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 @@ The precise terms and conditions for copying, distribution and modification follow. . - TERMS AND CONDITIONS + TERMS AND CONDITIONS . 0. Definitions. . @@ -650,9 +650,9 @@ 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 diff -Nru libgtextutils-0.7/debian/gbp.conf libgtextutils-0.7/debian/gbp.conf --- libgtextutils-0.7/debian/gbp.conf 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[DEFAULT] -# the default tag formats used: -upstream-tag = %(version)s -# use pristine-tar: -pristine-tar = True - -# Options only affecting gbp dch -[dch] -# include 7 digits of the commit id in the changelog enty: -id-length = 7 diff -Nru libgtextutils-0.7/debian/libgtextutils0v5.symbols libgtextutils-0.7/debian/libgtextutils0v5.symbols --- libgtextutils-0.7/debian/libgtextutils0v5.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libgtextutils-0.7/debian/libgtextutils0v5.symbols 2020-07-28 20:55:06.000000000 +0000 @@ -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 >&)@Base" 0.7 + (c++)"TextLineReader::TextLineReader(std::basic_istream >&)@Base" 0.7 + (c++)"InputStreamWrapper::InputStreamWrapper(std::__cxx11::basic_string, std::allocator > const&)@Base" 0.7 + (c++)"InputStreamWrapper::InputStreamWrapper(std::__cxx11::basic_string, std::allocator > const&)@Base" 0.7 + (c++)"OutputStreamWrapper::OutputStreamWrapper(std::__cxx11::basic_string, std::allocator > const&, bool)@Base" 0.7 + (c++)"OutputStreamWrapper::OutputStreamWrapper(std::__cxx11::basic_string, std::allocator > 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 diff -Nru libgtextutils-0.7/debian/libgtextutils-dev.install libgtextutils-0.7/debian/libgtextutils-dev.install --- libgtextutils-0.7/debian/libgtextutils-dev.install 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/libgtextutils-dev.install 2020-07-28 20:55:06.000000000 +0000 @@ -1,4 +1,5 @@ #! /usr/bin/dh-exec usr/include/gtextutils/gtextutils/ usr/include/ usr/lib/*/lib*.so usr/lib/${DEB_HOST_MULTIARCH}/ +usr/lib/*/lib*.a usr/lib/${DEB_HOST_MULTIARCH}/ usr/lib/*/pkgconfig/* usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ diff -Nru libgtextutils-0.7/debian/patches/enable_parallel_tests.patch libgtextutils-0.7/debian/patches/enable_parallel_tests.patch --- libgtextutils-0.7/debian/patches/enable_parallel_tests.patch 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/patches/enable_parallel_tests.patch 2020-07-28 20:55:06.000000000 +0000 @@ -3,6 +3,7 @@ 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 diff -Nru libgtextutils-0.7/debian/patches/fixing_implicit_conversion.patch libgtextutils-0.7/debian/patches/fixing_implicit_conversion.patch --- libgtextutils-0.7/debian/patches/fixing_implicit_conversion.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgtextutils-0.7/debian/patches/fixing_implicit_conversion.patch 2020-07-28 20:55:06.000000000 +0000 @@ -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 +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(); } + + }; diff -Nru libgtextutils-0.7/debian/patches/gcc-6.patch libgtextutils-0.7/debian/patches/gcc-6.patch --- libgtextutils-0.7/debian/patches/gcc-6.patch 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/patches/gcc-6.patch 2020-07-28 20:55:06.000000000 +0000 @@ -2,6 +2,7 @@ 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 diff -Nru libgtextutils-0.7/debian/patches/series libgtextutils-0.7/debian/patches/series --- libgtextutils-0.7/debian/patches/series 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/patches/series 2020-07-28 20:55:06.000000000 +0000 @@ -1,2 +1,3 @@ gcc-6.patch enable_parallel_tests.patch +fixing_implicit_conversion.patch diff -Nru libgtextutils-0.7/debian/rules libgtextutils-0.7/debian/rules --- libgtextutils-0.7/debian/rules 2018-12-04 08:45:10.000000000 +0000 +++ libgtextutils-0.7/debian/rules 2020-07-28 20:55:06.000000000 +0000 @@ -10,3 +10,17 @@ override_dh_auto_configure: ./reconf dh_auto_configure + +override_dh_install: + dh_install + find debian -name "*.la" -delete +# To let this work library package needs to be renamed to libgtextutils-0.7-0 +# But renaming is a lot of effort for limited purpose +# Once there might be a stronger reason to rename the debian/*.install files can be removed +# d-shlibmove --commit \ +# --multiarch \ +# --devunversioned \ +# --exclude-la \ +# --movedev debian/tmp/usr/gtextutils/gtextutils usr/include \ +# --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ +# debian/tmp/usr/lib/*/*.so diff -Nru libgtextutils-0.7/debian/salsa-ci.yml libgtextutils-0.7/debian/salsa-ci.yml --- libgtextutils-0.7/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ libgtextutils-0.7/debian/salsa-ci.yml 2020-07-28 20:55:06.000000000 +0000 @@ -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 diff -Nru libgtextutils-0.7/debian/upstream/metadata libgtextutils-0.7/debian/upstream/metadata --- libgtextutils-0.7/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libgtextutils-0.7/debian/upstream/metadata 2020-07-28 20:55:06.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/agordon/libgtextutils/issues +Bug-Submit: https://github.com/agordon/libgtextutils/issues/new +Repository: https://github.com/agordon/libgtextutils.git +Repository-Browse: https://github.com/agordon/libgtextutils