diff -Nru ros-bond-core-1.8.2/bond/CHANGELOG.rst ros-bond-core-1.8.3/bond/CHANGELOG.rst --- ros-bond-core-1.8.2/bond/CHANGELOG.rst 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bond/CHANGELOG.rst 2018-08-19 15:43:44.000000000 +0000 @@ -2,6 +2,9 @@ Changelog for package bond ^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.8.3 (2018-08-17) +------------------ + 1.8.2 (2018-04-27) ------------------ diff -Nru ros-bond-core-1.8.2/bond/package.xml ros-bond-core-1.8.3/bond/package.xml --- ros-bond-core-1.8.2/bond/package.xml 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bond/package.xml 2018-08-19 15:43:44.000000000 +0000 @@ -2,7 +2,7 @@ bond - 1.8.2 + 1.8.3 A bond allows two processes, A and B, to know when the other has terminated, either cleanly or by crashing. The bond remains diff -Nru ros-bond-core-1.8.2/bond_core/CHANGELOG.rst ros-bond-core-1.8.3/bond_core/CHANGELOG.rst --- ros-bond-core-1.8.2/bond_core/CHANGELOG.rst 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bond_core/CHANGELOG.rst 2018-08-19 15:43:44.000000000 +0000 @@ -2,6 +2,9 @@ Changelog for package bond_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.8.3 (2018-08-17) +------------------ + 1.8.2 (2018-04-27) ------------------ diff -Nru ros-bond-core-1.8.2/bond_core/package.xml ros-bond-core-1.8.3/bond_core/package.xml --- ros-bond-core-1.8.2/bond_core/package.xml 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bond_core/package.xml 2018-08-19 15:43:44.000000000 +0000 @@ -2,7 +2,7 @@ bond_core - 1.8.2 + 1.8.3 A bond allows two processes, A and B, to know when the other has terminated, either cleanly or by crashing. The bond remains diff -Nru ros-bond-core-1.8.2/bondcpp/CHANGELOG.rst ros-bond-core-1.8.3/bondcpp/CHANGELOG.rst --- ros-bond-core-1.8.2/bondcpp/CHANGELOG.rst 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bondcpp/CHANGELOG.rst 2018-08-19 15:43:44.000000000 +0000 @@ -2,6 +2,14 @@ Changelog for package bondcpp ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.8.3 (2018-08-17) +------------------ +* Argument to Boost Milliseconds must be integral in Boost >= 1.67 (`#37 `_) + * Argument to Boost milliseconds must be integral + * Fix style + * More consistent type +* Contributors: Paul-Edouard Sarlin + 1.8.2 (2018-04-27) ------------------ * uuid dependency fixup (`#36 `_) diff -Nru ros-bond-core-1.8.2/bondcpp/package.xml ros-bond-core-1.8.3/bondcpp/package.xml --- ros-bond-core-1.8.2/bondcpp/package.xml 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bondcpp/package.xml 2018-08-19 15:43:44.000000000 +0000 @@ -2,7 +2,7 @@ bondcpp - 1.8.2 + 1.8.3 C++ implementation of bond, a mechanism for checking when another process has terminated. diff -Nru ros-bond-core-1.8.2/bondcpp/src/bond.cpp ros-bond-core-1.8.3/bondcpp/src/bond.cpp --- ros-bond-core-1.8.2/bondcpp/src/bond.cpp 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bondcpp/src/bond.cpp 2018-08-19 15:43:44.000000000 +0000 @@ -218,7 +218,8 @@ break; // The deadline has expired } - condition_.timed_wait(mutex_, boost::posix_time::milliseconds(wait_time.toSec() * 1000.0f)); + condition_.timed_wait(mutex_, boost::posix_time::milliseconds( + static_cast(wait_time.toSec() * 1000.0f))); } return sm_.getState().getId() != SM::WaitingForSister.getId(); } @@ -246,7 +247,8 @@ break; // The deadline has expired } - condition_.timed_wait(mutex_, boost::posix_time::milliseconds(wait_time.toSec() * 1000.0f)); + condition_.timed_wait(mutex_, boost::posix_time::milliseconds( + static_cast(wait_time.toSec() * 1000.0f))); } return sm_.getState().getId() == SM::Dead.getId(); } diff -Nru ros-bond-core-1.8.2/bondpy/CHANGELOG.rst ros-bond-core-1.8.3/bondpy/CHANGELOG.rst --- ros-bond-core-1.8.2/bondpy/CHANGELOG.rst 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bondpy/CHANGELOG.rst 2018-08-19 15:43:44.000000000 +0000 @@ -2,6 +2,9 @@ Changelog for package bondpy ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.8.3 (2018-08-17) +------------------ + 1.8.2 (2018-04-27) ------------------ diff -Nru ros-bond-core-1.8.2/bondpy/package.xml ros-bond-core-1.8.3/bondpy/package.xml --- ros-bond-core-1.8.2/bondpy/package.xml 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/bondpy/package.xml 2018-08-19 15:43:44.000000000 +0000 @@ -2,7 +2,7 @@ bondpy - 1.8.2 + 1.8.3 Python implementation of bond, a mechanism for checking when another process has terminated. diff -Nru ros-bond-core-1.8.2/debian/changelog ros-bond-core-1.8.3/debian/changelog --- ros-bond-core-1.8.2/debian/changelog 2018-08-01 13:45:15.000000000 +0000 +++ ros-bond-core-1.8.3/debian/changelog 2018-08-19 15:55:45.000000000 +0000 @@ -1,9 +1,10 @@ -ros-bond-core (1.8.2-3ubuntu1) cosmic; urgency=medium +ros-bond-core (1.8.3-1) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - fix build failure with new boost + * New upstream version 1.8.3 + * Bump policy version (no changes) + * Add Python 3 packages - -- Gianfranco Costamagna Wed, 01 Aug 2018 15:45:15 +0200 + -- Jochen Sprickerhof Sun, 19 Aug 2018 17:55:45 +0200 ros-bond-core (1.8.2-3) unstable; urgency=medium @@ -12,13 +13,6 @@ -- Jochen Sprickerhof Tue, 31 Jul 2018 21:56:53 +0200 -ros-bond-core (1.8.2-2ubuntu1) cosmic; urgency=medium - - * debian/patches/1240bce50ca1538cdad07dc472d31797257e0851.patch: - - fix build failure with new boost - - -- Gianfranco Costamagna Fri, 27 Jul 2018 14:37:28 +0200 - ros-bond-core (1.8.2-2) unstable; urgency=medium * Add MA hints diff -Nru ros-bond-core-1.8.2/debian/control ros-bond-core-1.8.3/debian/control --- ros-bond-core-1.8.2/debian/control 2018-08-01 13:45:15.000000000 +0000 +++ ros-bond-core-1.8.3/debian/control 2018-08-19 15:55:23.000000000 +0000 @@ -5,7 +5,7 @@ Jochen Sprickerhof , Leopold Palomo-Avellaneda Build-Depends: debhelper (>= 11), catkin, ros-message-generation, libstd-msgs-dev, - python-all, python-setuptools, + python-all, python3-all, python-setuptools, ros-cmake-modules, libroscpp-dev, librosconsole-dev, libros-rosgraph-msgs-dev, ros-rosgraph-msgs, libxmlrpcpp-dev, uuid-dev, @@ -16,7 +16,7 @@ libboost-filesystem-dev, libboost-regex-dev, dh-python, libconsole-bridge-dev -Standards-Version: 4.1.5 +Standards-Version: 4.2.0 Section: libs Rules-Requires-Root: no Homepage: https://wiki.ros.org/bond_core @@ -42,9 +42,23 @@ Section: python Architecture: all Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-genpy, python-std-msgs -Description: Messages related to Robot OS bond_core - Python +Description: Messages related to Robot OS bond_core - Python 2 This package is part of Robot OS (ROS). This is the 'bond' process state - machine library Python bindings. + machine library Python 2 bindings. + . + Bond is a mechanism for checking when another process has + terminated. A bond allows two processes, A and B, to know when the + other has terminated, either cleanly or by crashing. The bond remains + connected until it is either broken explicitly or until a heartbeat + times out. + +Package: python3-bond +Section: python +Architecture: all +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-genpy, python3-std-msgs +Description: Messages related to Robot OS bond_core - Python 3 + This package is part of Robot OS (ROS). This is the 'bond' process state + machine library Python 3 bindings. . Bond is a mechanism for checking when another process has terminated. A bond allows two processes, A and B, to know when the @@ -84,12 +98,23 @@ Section: python Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Description: Robot OS 'bond' State Machine Compiler Python package +Description: Robot OS 'bond' State Machine Compiler Python 2 package + The State Machine Compiler (SMC) from http://smc.sourceforge.net/ + converts a language-independent description of a state machine + into the source code to support that state machine. + . + This package contains the Python 2 interface. + +Package: python3-smclib +Section: python +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: Robot OS 'bond' State Machine Compiler Python 3 package The State Machine Compiler (SMC) from http://smc.sourceforge.net/ converts a language-independent description of a state machine into the source code to support that state machine. . - This package contains the Python interface. + This package contains the Python 3 interface. Package: libbondcpp-dev Section: libdevel @@ -124,12 +149,26 @@ Section: python Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-bond, python-rospy, python-smclib -Description: Python implementation of bond +Description: Python 2 implementation of bond + This package is part of Robot OS (ROS). It is the 'bond' process state + machine library Python 2 implementation. + . + Bond is a mechanism for checking when another process has terminated. A + bond allows two processes, A and B, to know when the other has terminated, + either cleanly or by crashing. The bond remains connected until it is either + broken explicitly or until a heartbeat times out. This package contains + the Python 2 package. + +Package: python3-bondpy +Section: python +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-bond, python3-rospy, python3-smclib +Description: Python 3 implementation of bond This package is part of Robot OS (ROS). It is the 'bond' process state - machine library Python implementation. + machine library Python 3 implementation. . Bond is a mechanism for checking when another process has terminated. A bond allows two processes, A and B, to know when the other has terminated, either cleanly or by crashing. The bond remains connected until it is either broken explicitly or until a heartbeat times out. This package contains - the Python package. + the Python 3 package. diff -Nru ros-bond-core-1.8.2/debian/patches/1240bce50ca1538cdad07dc472d31797257e0851.patch ros-bond-core-1.8.3/debian/patches/1240bce50ca1538cdad07dc472d31797257e0851.patch --- ros-bond-core-1.8.2/debian/patches/1240bce50ca1538cdad07dc472d31797257e0851.patch 2018-07-27 12:37:28.000000000 +0000 +++ ros-bond-core-1.8.3/debian/patches/1240bce50ca1538cdad07dc472d31797257e0851.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From 1240bce50ca1538cdad07dc472d31797257e0851 Mon Sep 17 00:00:00 2001 -From: Paul-Edouard Sarlin -Date: Sun, 29 Apr 2018 22:40:15 +0200 -Subject: [PATCH] Argument to Boost Milliseconds must be integral in Boost >= - 1.67 (#37) - -* Argument to Boost milliseconds must be integral - -* Fix style - -* More consistent type ---- - bondcpp/src/bond.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bondcpp/src/bond.cpp b/bondcpp/src/bond.cpp -index 8872d61..58e7901 100644 ---- a/bondcpp/src/bond.cpp -+++ b/bondcpp/src/bond.cpp -@@ -218,7 +218,8 @@ bool Bond::waitUntilFormed(ros::WallDuration timeout) - break; // The deadline has expired - } - -- condition_.timed_wait(mutex_, boost::posix_time::milliseconds(wait_time.toSec() * 1000.0f)); -+ condition_.timed_wait(mutex_, boost::posix_time::milliseconds( -+ static_cast(wait_time.toSec() * 1000.0f))); - } - return sm_.getState().getId() != SM::WaitingForSister.getId(); - } -@@ -246,7 +247,8 @@ bool Bond::waitUntilBroken(ros::WallDuration timeout) - break; // The deadline has expired - } - -- condition_.timed_wait(mutex_, boost::posix_time::milliseconds(wait_time.toSec() * 1000.0f)); -+ condition_.timed_wait(mutex_, boost::posix_time::milliseconds( -+ static_cast(wait_time.toSec() * 1000.0f))); - } - return sm_.getState().getId() == SM::Dead.getId(); - } diff -Nru ros-bond-core-1.8.2/debian/patches/series ros-bond-core-1.8.3/debian/patches/series --- ros-bond-core-1.8.2/debian/patches/series 2018-07-27 12:37:27.000000000 +0000 +++ ros-bond-core-1.8.3/debian/patches/series 2018-08-19 15:44:26.000000000 +0000 @@ -1,3 +1,2 @@ 0001-Add-CMakeLists.txt.patch 0002-Add-Debian-specific-SOVERSION.patch -1240bce50ca1538cdad07dc472d31797257e0851.patch diff -Nru ros-bond-core-1.8.2/debian/python3-bond.pyinstall ros-bond-core-1.8.3/debian/python3-bond.pyinstall --- ros-bond-core-1.8.2/debian/python3-bond.pyinstall 1970-01-01 00:00:00.000000000 +0000 +++ ros-bond-core-1.8.3/debian/python3-bond.pyinstall 2018-08-19 15:48:32.000000000 +0000 @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python2*/*/bond/*.py bond +debian/tmp/usr/lib/python2*/*/bond/msg/*.py bond.msg diff -Nru ros-bond-core-1.8.2/debian/python3-bondpy.pyinstall ros-bond-core-1.8.3/debian/python3-bondpy.pyinstall --- ros-bond-core-1.8.2/debian/python3-bondpy.pyinstall 1970-01-01 00:00:00.000000000 +0000 +++ ros-bond-core-1.8.3/debian/python3-bondpy.pyinstall 2018-08-19 15:50:47.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/lib/python2*/*/bondpy/*.py bondpy diff -Nru ros-bond-core-1.8.2/debian/python3-smclib.pyinstall ros-bond-core-1.8.3/debian/python3-smclib.pyinstall --- ros-bond-core-1.8.2/debian/python3-smclib.pyinstall 1970-01-01 00:00:00.000000000 +0000 +++ ros-bond-core-1.8.3/debian/python3-smclib.pyinstall 2018-08-19 15:50:31.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/lib/python2*/*/smclib/*.py smclib diff -Nru ros-bond-core-1.8.2/debian/rules ros-bond-core-1.8.3/debian/rules --- ros-bond-core-1.8.2/debian/rules 2018-06-16 16:10:08.000000000 +0000 +++ ros-bond-core-1.8.3/debian/rules 2018-08-19 15:48:13.000000000 +0000 @@ -3,4 +3,4 @@ include /usr/share/dpkg/default.mk %: - dh $@ --with=python2 --buildsystem=cmake + dh $@ --with=python2,python3 --buildsystem=cmake diff -Nru ros-bond-core-1.8.2/smclib/CHANGELOG.rst ros-bond-core-1.8.3/smclib/CHANGELOG.rst --- ros-bond-core-1.8.2/smclib/CHANGELOG.rst 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/smclib/CHANGELOG.rst 2018-08-19 15:43:44.000000000 +0000 @@ -2,6 +2,9 @@ Changelog for package smclib ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.8.3 (2018-08-17) +------------------ + 1.8.2 (2018-04-27) ------------------ diff -Nru ros-bond-core-1.8.2/smclib/package.xml ros-bond-core-1.8.3/smclib/package.xml --- ros-bond-core-1.8.2/smclib/package.xml 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/smclib/package.xml 2018-08-19 15:43:44.000000000 +0000 @@ -2,7 +2,7 @@ smclib - 1.8.2 + 1.8.3 The State Machine Compiler (SMC) from http://smc.sourceforge.net/ converts a language-independent description of a state machine diff -Nru ros-bond-core-1.8.2/test_bond/CHANGELOG.rst ros-bond-core-1.8.3/test_bond/CHANGELOG.rst --- ros-bond-core-1.8.2/test_bond/CHANGELOG.rst 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/test_bond/CHANGELOG.rst 2018-08-19 15:43:44.000000000 +0000 @@ -2,6 +2,13 @@ Changelog for package test_bond ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.8.3 (2018-08-17) +------------------ +* Fix build issue on Windows (`#38 `_) + * Fix build issue on Windows + * indent for better readability +* Contributors: Johnson Shih + 1.8.2 (2018-04-27) ------------------ * uuid dependency fixup (`#36 `_) diff -Nru ros-bond-core-1.8.2/test_bond/package.xml ros-bond-core-1.8.3/test_bond/package.xml --- ros-bond-core-1.8.2/test_bond/package.xml 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/test_bond/package.xml 2018-08-19 15:43:44.000000000 +0000 @@ -2,7 +2,7 @@ test_bond - 1.8.2 + 1.8.3 Contains tests for [[bond]], including tests for [[bondpy]] and [[bondcpp]]. diff -Nru ros-bond-core-1.8.2/test_bond/test/exercise_bond.cpp ros-bond-core-1.8.3/test_bond/test/exercise_bond.cpp --- ros-bond-core-1.8.2/test_bond/test/exercise_bond.cpp 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/test_bond/test/exercise_bond.cpp 2018-08-19 15:43:44.000000000 +0000 @@ -30,7 +30,13 @@ #include #include -#include + +#ifndef _WIN32 +# include +#else +# include +#endif + #include #include @@ -41,11 +47,21 @@ std::string genId() { +#ifndef _WIN32 uuid_t uuid; uuid_generate_random(uuid); char uuid_str[40]; uuid_unparse(uuid, uuid_str); return std::string(uuid_str); +#else + UUID uuid; + UuidCreate(&uuid); + RPC_CSTR str; + UuidToStringA(&uuid, &str); + std::string return_string(reinterpret_cast(str)); + RpcStringFreeA(&str); + return return_string; +#endif } ros::ServiceClient getService() diff -Nru ros-bond-core-1.8.2/test_bond/test/test_callbacks_cpp.cpp ros-bond-core-1.8.3/test_bond/test/test_callbacks_cpp.cpp --- ros-bond-core-1.8.2/test_bond/test/test_callbacks_cpp.cpp 2018-04-27 20:45:52.000000000 +0000 +++ ros-bond-core-1.8.3/test_bond/test/test_callbacks_cpp.cpp 2018-08-19 15:43:44.000000000 +0000 @@ -30,7 +30,13 @@ #include #include -#include + +#ifndef _WIN32 +# include +#else +# include +#endif + #include #include @@ -40,11 +46,21 @@ const char TOPIC[] = "test_bond_topic"; std::string genId() { +#ifndef _WIN32 uuid_t uuid; uuid_generate_random(uuid); char uuid_str[40]; uuid_unparse(uuid, uuid_str); return std::string(uuid_str); +#else + UUID uuid; + UuidCreate(&uuid); + RPC_CSTR str; + UuidToStringA(&uuid, &str); + std::string return_string(reinterpret_cast(str)); + RpcStringFreeA(&str); + return return_string; +#endif } TEST(TestCallbacksCpp, dieInLifeCallback)