Control: tag -1 +patch FWIW, the attached patch is what I'd suggest for a 3.1.4 update. Ivo, Fathi, please consider using this as a basis for a new release. Let me know if I've missed anything.
This also builds fine with current master. I've tentatively marked symbols introduced since 3.1.4 as "3.1.5".
diff -Naur debian.orig/changelog debian/changelog --- debian.orig/changelog 2016-11-30 23:19:15.000000000 +0100 +++ debian/changelog 2018-05-09 12:17:18.819724621 +0200 @@ -1,3 +1,9 @@ +libmodbus (3.1.4-1) unstable; urgency=medium + + * New upstream release + + -- Lukas Wunner <lu...@wunner.de> Wed, 09 May 2018 10:33:00 +0200 + libmodbus (3.0.6-2) unstable; urgency=medium * Update standards-version to 3.9.8 (no changes) diff -Naur debian.orig/copyright debian/copyright --- debian.orig/copyright 2016-11-30 23:19:15.000000000 +0100 +++ debian/copyright 2018-05-09 13:45:47.685423244 +0200 @@ -5,19 +5,20 @@ Files: * Copyright: - 2008-2014 Stéphane Raimbault <stephane.raimba...@gmail.com + 2008-2017 Stéphane Raimbault <stephane.raimba...@gmail.com> License: LGPL-2.1+ Files: debian/* Copyright: 2008-2011 Stéphane Raimbault <stephane.raimba...@gmail.com> 2011-2014 Ivo De Decker <iv...@debian.org> + 2018 Lukas Wunner <lu...@wunner.de> License: LGPL-2.1+ Files: tests/* Copyright: - 2008-2014 Stéphane Raimbault <stephane.raimba...@gmail.com> -License: GPL-3+ + 2008-2017 Stéphane Raimbault <stephane.raimba...@gmail.com> +License: BSD-3-clause License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it @@ -37,20 +38,32 @@ On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/LGPL-2.1 -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - . - On Debian systems, the complete text of the GNU General Public License - version 3 can be found in "/usr/share/common-licenses/GPL-3". +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + . + * The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Naur debian.orig/libmodbus5.symbols debian/libmodbus5.symbols --- debian.orig/libmodbus5.symbols 2016-11-30 23:19:15.000000000 +0100 +++ debian/libmodbus5.symbols 2018-05-09 12:26:14.768471331 +0200 @@ -1,31 +1,32 @@ libmodbus.so.5 libmodbus5 #MINVER# _error_print@Base 3.0.2 _modbus_init_common@Base 3.0.2 + _modbus_receive_msg@Base 3.1.0 _modbus_rtu_backend@Base 3.0.2 - _modbus_rtu_check_integrity@Base 3.0.2 - _modbus_rtu_close@Base 3.0.2 - _modbus_rtu_filter_request@Base 3.0.2 - _modbus_rtu_flush@Base 3.0.2 - _modbus_rtu_prepare_response_tid@Base 3.0.2 - _modbus_rtu_recv@Base 3.0.2 - _modbus_rtu_select@Base 3.0.2 - _modbus_rtu_send@Base 3.0.2 - _modbus_rtu_send_msg_pre@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_check_integrity@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_close@Base 3.0.2 +#MISSING: 3.1.0# _modbus_rtu_filter_request@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_flush@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_prepare_response_tid@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_recv@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_select@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_send@Base 3.0.2 +#MISSING: 3.1.1# _modbus_rtu_send_msg_pre@Base 3.0.2 _modbus_tcp_backend@Base 3.0.2 - _modbus_tcp_build_request_basis@Base 3.0.2 - _modbus_tcp_build_response_basis@Base 3.0.2 - _modbus_tcp_check_integrity@Base 3.0.2 - _modbus_tcp_close@Base 3.0.2 - _modbus_tcp_filter_request@Base 3.0.2 - _modbus_tcp_flush@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_build_request_basis@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_build_response_basis@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_check_integrity@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_close@Base 3.0.2 +#MISSING: 3.1.0# _modbus_tcp_filter_request@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_flush@Base 3.0.2 _modbus_tcp_pi_backend@Base 3.0.2 - _modbus_tcp_pre_check_confirmation@Base 3.0.2 - _modbus_tcp_prepare_response_tid@Base 3.0.2 - _modbus_tcp_recv@Base 3.0.2 - _modbus_tcp_select@Base 3.0.2 - _modbus_tcp_send@Base 3.0.2 - _modbus_tcp_send_msg_pre@Base 3.0.2 - _sleep_and_flush@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_pre_check_confirmation@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_prepare_response_tid@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_recv@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_select@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_send@Base 3.0.2 +#MISSING: 3.1.1# _modbus_tcp_send_msg_pre@Base 3.0.2 +#MISSING: 3.1.1# _sleep_and_flush@Base 3.0.2 libmodbus_version_major@Base 3.0.2 libmodbus_version_micro@Base 3.0.2 libmodbus_version_minor@Base 3.0.2 @@ -36,11 +37,19 @@ modbus_get_byte_from_bits@Base 3.0.2 modbus_get_byte_timeout@Base 3.0.2 modbus_get_float@Base 3.0.2 + modbus_get_float_abcd@Base 3.1.3 + modbus_get_float_badc@Base 3.1.3 + modbus_get_float_cdab@Base 3.1.3 + modbus_get_float_dcba@Base 3.1.1 modbus_get_header_length@Base 3.0.2 + modbus_get_indication_timeout@Base 3.1.5 modbus_get_response_timeout@Base 3.0.2 + modbus_get_slave@Base 3.1.5 modbus_get_socket@Base 3.0.2 modbus_mapping_free@Base 3.0.2 modbus_mapping_new@Base 3.0.2 + modbus_mapping_new_start_address@Base 3.1.3 + modbus_mask_write_register@Base 3.1.1 modbus_new_rtu@Base 3.0.2 modbus_new_tcp@Base 3.0.2 modbus_new_tcp_pi@Base 3.0.2 @@ -53,7 +62,12 @@ modbus_reply@Base 3.0.2 modbus_reply_exception@Base 3.0.2 modbus_report_slave_id@Base 3.0.2 + modbus_rtu_get_rts@Base 3.1.0 + modbus_rtu_get_rts_delay@Base 3.1.3 modbus_rtu_get_serial_mode@Base 3.0.2 + modbus_rtu_set_custom_rts@Base 3.1.3 + modbus_rtu_set_rts@Base 3.1.0 + modbus_rtu_set_rts_delay@Base 3.1.3 modbus_rtu_set_serial_mode@Base 3.0.2 modbus_send_raw_request@Base 3.0.2 modbus_set_bits_from_byte@Base 3.0.2 @@ -62,6 +76,11 @@ modbus_set_debug@Base 3.0.2 modbus_set_error_recovery@Base 3.0.2 modbus_set_float@Base 3.0.2 + modbus_set_float_abcd@Base 3.1.3 + modbus_set_float_badc@Base 3.1.3 + modbus_set_float_cdab@Base 3.1.3 + modbus_set_float_dcba@Base 3.1.1 + modbus_set_indication_timeout@Base 3.1.5 modbus_set_response_timeout@Base 3.0.2 modbus_set_slave@Base 3.0.2 modbus_set_socket@Base 3.0.2 diff -Naur debian.orig/libmodbus-dev.docs debian/libmodbus-dev.docs --- debian.orig/libmodbus-dev.docs 2016-11-30 23:19:15.000000000 +0100 +++ debian/libmodbus-dev.docs 2018-05-09 10:49:37.049010788 +0200 @@ -1 +1 @@ -MIGRATION README.rst AUTHORS +MIGRATION README.md AUTHORS diff -Naur debian.orig/libmodbus-dev.examples debian/libmodbus-dev.examples --- debian.orig/libmodbus-dev.examples 2016-11-30 23:19:15.000000000 +0100 +++ debian/libmodbus-dev.examples 2018-05-09 11:06:27.775970733 +0200 @@ -1,2 +1,2 @@ tests/*.[ch] -tests/README +tests/README.md
