diff -Nru ros-ros-comm-1.11.16/debian/changelog ros-ros-comm-1.11.16/debian/changelog --- ros-ros-comm-1.11.16/debian/changelog 2016-01-10 04:03:29.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/changelog 2016-01-20 21:22:25.000000000 +0000 @@ -1,8 +1,18 @@ +ros-ros-comm (1.11.16-3) unstable; urgency=medium + + * mv xmlrpcpp includes to include/xmlrpcpp (Closes: #812129) + + -- Jochen Sprickerhof Sat, 16 Jan 2016 14:27:26 +0100 + ros-ros-comm (1.11.16-2) unstable; urgency=medium - * Upload lintian-clean package + [ Wookey ] + * Add missing file to debian/copyright + + [ Jochen Sprickerhof ] + * Add dependencies - -- Jochen Sprickerhof Sun, 10 Jan 2016 02:39:35 +0000 + -- Jochen Sprickerhof Sun, 10 Jan 2016 13:18:58 +0100 ros-ros-comm (1.11.16-1) unstable; urgency=medium diff -Nru ros-ros-comm-1.11.16/debian/control ros-ros-comm-1.11.16/debian/control --- ros-ros-comm-1.11.16/debian/control 2016-01-10 01:10:19.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/control 2016-01-20 21:25:57.000000000 +0000 @@ -226,12 +226,14 @@ roslaunch takes in one or more XML configuration files (with the launch extension) that specify the parameters to set and nodes to launch, as well as the machines that they should be run on. + . + This package contains the roscore programm. Package: python-rosmaster Section: python Architecture: all Multi-Arch: allowed -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-rosgraph +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-rosgraph, python-rospkg Description: Robot OS Master implementation This package is part of Robot OS (ROS). The rosmaster package implements the ROS Master. Most programs will not need to interact diff -Nru ros-ros-comm-1.11.16/debian/copyright ros-ros-comm-1.11.16/debian/copyright --- ros-ros-comm-1.11.16/debian/copyright 2016-01-10 04:03:29.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/copyright 2015-12-24 07:16:49.000000000 +0000 @@ -145,7 +145,7 @@ POSSIBILITY OF SUCH DAMAGE. -License: LGPL-2.1+ +License: LGPL-2.1 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the @@ -155,8 +155,8 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write - to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. + to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA . A full copy of the LGPL license is included in the file /usr/share/common-licenses/LGPL-2.1. \ No newline at end of file diff -Nru ros-ros-comm-1.11.16/debian/libxmlrpcpp-dev.install ros-ros-comm-1.11.16/debian/libxmlrpcpp-dev.install --- ros-ros-comm-1.11.16/debian/libxmlrpcpp-dev.install 2015-11-26 18:08:27.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/libxmlrpcpp-dev.install 2016-01-16 12:22:37.000000000 +0000 @@ -1,5 +1,4 @@ -usr/include/XmlRpc* -usr/include/base64.h +usr/include/xmlrpcpp usr/lib/*/libxmlrpcpp.so usr/lib/*/pkgconfig/xmlrpcpp.pc usr/share/xmlrpcpp diff -Nru ros-ros-comm-1.11.16/debian/patches/0007-xmlrpcpp-move-heaers-to-include-xmlrpcpp.patch ros-ros-comm-1.11.16/debian/patches/0007-xmlrpcpp-move-heaers-to-include-xmlrpcpp.patch --- ros-ros-comm-1.11.16/debian/patches/0007-xmlrpcpp-move-heaers-to-include-xmlrpcpp.patch 1970-01-01 00:00:00.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/patches/0007-xmlrpcpp-move-heaers-to-include-xmlrpcpp.patch 2016-01-18 21:50:02.000000000 +0000 @@ -0,0 +1,772 @@ +From: Jochen Sprickerhof +Date: Sat, 16 Jan 2016 11:56:42 +0100 +Subject: move heaers to include/xmlrpcpp + +--- + clients/roscpp/include/ros/master.h | 2 +- + clients/roscpp/include/ros/node_handle.h | 2 +- + clients/roscpp/include/ros/param.h | 2 +- + clients/roscpp/include/ros/publication.h | 2 +- + clients/roscpp/include/ros/service_publication.h | 2 +- + clients/roscpp/include/ros/subscription.h | 2 +- + clients/roscpp/include/ros/topic_manager.h | 2 +- + clients/roscpp/include/ros/xmlrpc_manager.h | 2 +- + clients/roscpp/src/libros/init.cpp | 2 +- + clients/roscpp/src/libros/master.cpp | 2 +- + clients/roscpp/src/libros/node_handle.cpp | 2 +- + clients/roscpp/src/libros/service_manager.cpp | 2 +- + clients/roscpp/src/libros/topic_manager.cpp | 2 +- + test/test_roscpp/test/src/check_master.cpp | 2 +- + tools/rosbag/src/recorder.cpp | 2 +- + utilities/xmlrpcpp/CMakeLists.txt | 3 +-- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpc.h | 12 ++++++------ + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcClient.h | 6 +++--- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcDecl.h | 0 + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcDispatch.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcException.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcServer.h | 6 +++--- + .../xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcServerConnection.h | 6 +++--- + .../xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcServerMethod.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcSocket.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcSource.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcUtil.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcValue.h | 2 +- + utilities/xmlrpcpp/include/{ => xmlrpcpp}/base64.h | 0 + utilities/xmlrpcpp/src/XmlRpcClient.cpp | 6 +++--- + utilities/xmlrpcpp/src/XmlRpcDispatch.cpp | 6 +++--- + utilities/xmlrpcpp/src/XmlRpcServer.cpp | 12 ++++++------ + utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp | 6 +++--- + utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp | 4 ++-- + utilities/xmlrpcpp/src/XmlRpcSocket.cpp | 4 ++-- + utilities/xmlrpcpp/src/XmlRpcSource.cpp | 6 +++--- + utilities/xmlrpcpp/src/XmlRpcUtil.cpp | 4 ++-- + utilities/xmlrpcpp/src/XmlRpcValue.cpp | 8 ++++---- + utilities/xmlrpcpp/test/FileClient.cpp | 2 +- + utilities/xmlrpcpp/test/HelloClient.cpp | 2 +- + utilities/xmlrpcpp/test/HelloServer.cpp | 2 +- + utilities/xmlrpcpp/test/TestBase64Client.cpp | 2 +- + utilities/xmlrpcpp/test/TestBase64Server.cpp | 2 +- + utilities/xmlrpcpp/test/TestValues.cpp | 2 +- + utilities/xmlrpcpp/test/TestValuesWin32.cpp | 2 +- + utilities/xmlrpcpp/test/TestXml.cpp | 2 +- + utilities/xmlrpcpp/test/Validator.cpp | 2 +- + utilities/xmlrpcpp/test/bool_test.cpp | 2 +- + utilities/xmlrpcpp/test/port_zero_server.cpp | 2 +- + 49 files changed, 77 insertions(+), 78 deletions(-) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpc.h (93%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcClient.h (97%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcDecl.h (100%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcDispatch.h (98%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcException.h (96%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcServer.h (96%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcServerConnection.h (96%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcServerMethod.h (97%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcSocket.h (98%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcSource.h (98%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcUtil.h (98%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/XmlRpcValue.h (99%) + rename utilities/xmlrpcpp/include/{ => xmlrpcpp}/base64.h (100%) + +diff --git a/clients/roscpp/include/ros/master.h b/clients/roscpp/include/ros/master.h +index 9eefdf3..6cabd01 100644 +--- a/clients/roscpp/include/ros/master.h ++++ b/clients/roscpp/include/ros/master.h +@@ -29,7 +29,7 @@ + #define ROSCPP_MASTER_H + + #include "forwards.h" +-#include "XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcValue.h" + #include "common.h" + + namespace ros +diff --git a/clients/roscpp/include/ros/node_handle.h b/clients/roscpp/include/ros/node_handle.h +index b765c62..588b9f2 100644 +--- a/clients/roscpp/include/ros/node_handle.h ++++ b/clients/roscpp/include/ros/node_handle.h +@@ -48,7 +48,7 @@ + + #include + +-#include ++#include + + namespace ros + { +diff --git a/clients/roscpp/include/ros/param.h b/clients/roscpp/include/ros/param.h +index a015043..8c236b3 100644 +--- a/clients/roscpp/include/ros/param.h ++++ b/clients/roscpp/include/ros/param.h +@@ -30,7 +30,7 @@ + + #include "forwards.h" + #include "common.h" +-#include "XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcValue.h" + + #include + #include +diff --git a/clients/roscpp/include/ros/publication.h b/clients/roscpp/include/ros/publication.h +index 5183e08..1ea2187 100644 +--- a/clients/roscpp/include/ros/publication.h ++++ b/clients/roscpp/include/ros/publication.h +@@ -31,7 +31,7 @@ + #include "ros/forwards.h" + #include "ros/advertise_options.h" + #include "common.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + +diff --git a/clients/roscpp/include/ros/service_publication.h b/clients/roscpp/include/ros/service_publication.h +index bd44c34..ff4f8b4 100644 +--- a/clients/roscpp/include/ros/service_publication.h ++++ b/clients/roscpp/include/ros/service_publication.h +@@ -30,7 +30,7 @@ + + #include "ros/service_callback_helper.h" + #include "common.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + +diff --git a/clients/roscpp/include/ros/subscription.h b/clients/roscpp/include/ros/subscription.h +index 7da3219..ed726a3 100644 +--- a/clients/roscpp/include/ros/subscription.h ++++ b/clients/roscpp/include/ros/subscription.h +@@ -35,7 +35,7 @@ + #include "ros/transport_hints.h" + #include "ros/xmlrpc_manager.h" + #include "ros/statistics.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + #include +diff --git a/clients/roscpp/include/ros/topic_manager.h b/clients/roscpp/include/ros/topic_manager.h +index 5827e82..3a80f9c 100644 +--- a/clients/roscpp/include/ros/topic_manager.h ++++ b/clients/roscpp/include/ros/topic_manager.h +@@ -33,7 +33,7 @@ + #include "ros/serialization.h" + #include "rosout_appender.h" + +-#include "XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcValue.h" + + #include + #include +diff --git a/clients/roscpp/include/ros/xmlrpc_manager.h b/clients/roscpp/include/ros/xmlrpc_manager.h +index 7dc55ee..2dc5034 100644 +--- a/clients/roscpp/include/ros/xmlrpc_manager.h ++++ b/clients/roscpp/include/ros/xmlrpc_manager.h +@@ -36,7 +36,7 @@ + #include + + #include "common.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + +diff --git a/clients/roscpp/src/libros/init.cpp b/clients/roscpp/src/libros/init.cpp +index 1435d02..dcc3d26 100644 +--- a/clients/roscpp/src/libros/init.cpp ++++ b/clients/roscpp/src/libros/init.cpp +@@ -48,7 +48,7 @@ + #include "ros/subscribe_options.h" + #include "ros/transport/transport_tcp.h" + #include "ros/internal_timer_manager.h" +-#include "XmlRpcSocket.h" ++#include "xmlrpcpp/XmlRpcSocket.h" + + #include "roscpp/GetLoggers.h" + #include "roscpp/SetLoggerLevel.h" +diff --git a/clients/roscpp/src/libros/master.cpp b/clients/roscpp/src/libros/master.cpp +index c25be66..ad63545 100644 +--- a/clients/roscpp/src/libros/master.cpp ++++ b/clients/roscpp/src/libros/master.cpp +@@ -34,7 +34,7 @@ + #include + #include + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + namespace ros + { +diff --git a/clients/roscpp/src/libros/node_handle.cpp b/clients/roscpp/src/libros/node_handle.cpp +index 271b6c4..0d2a877 100644 +--- a/clients/roscpp/src/libros/node_handle.cpp ++++ b/clients/roscpp/src/libros/node_handle.cpp +@@ -42,7 +42,7 @@ + #include "ros/names.h" + #include "ros/init.h" + #include "ros/this_node.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + +diff --git a/clients/roscpp/src/libros/service_manager.cpp b/clients/roscpp/src/libros/service_manager.cpp +index 1f3f4bb..ad66aa7 100644 +--- a/clients/roscpp/src/libros/service_manager.cpp ++++ b/clients/roscpp/src/libros/service_manager.cpp +@@ -42,7 +42,7 @@ + #include "ros/connection.h" + #include "ros/file_log.h" + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + +diff --git a/clients/roscpp/src/libros/topic_manager.cpp b/clients/roscpp/src/libros/topic_manager.cpp +index a11fd81..1da529e 100644 +--- a/clients/roscpp/src/libros/topic_manager.cpp ++++ b/clients/roscpp/src/libros/topic_manager.cpp +@@ -41,7 +41,7 @@ + #include "ros/file_log.h" + #include "ros/subscribe_options.h" + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + +diff --git a/test/test_roscpp/test/src/check_master.cpp b/test/test_roscpp/test/src/check_master.cpp +index 9b03321..4392f2b 100644 +--- a/test/test_roscpp/test/src/check_master.cpp ++++ b/test/test_roscpp/test/src/check_master.cpp +@@ -40,7 +40,7 @@ + + #include "ros/ros.h" + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + using namespace XmlRpc; + +diff --git a/tools/rosbag/src/recorder.cpp b/tools/rosbag/src/recorder.cpp +index 19fc1f0..0020423 100644 +--- a/tools/rosbag/src/recorder.cpp ++++ b/tools/rosbag/src/recorder.cpp +@@ -60,7 +60,7 @@ + + #include "ros/network.h" + #include "ros/xmlrpc_manager.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #define foreach BOOST_FOREACH + +diff --git a/utilities/xmlrpcpp/CMakeLists.txt b/utilities/xmlrpcpp/CMakeLists.txt +index 67b1a4c..b2c1ef1 100644 +--- a/utilities/xmlrpcpp/CMakeLists.txt ++++ b/utilities/xmlrpcpp/CMakeLists.txt +@@ -31,8 +31,7 @@ if(WIN32) + target_link_libraries(xmlrpcpp ws2_32) + endif() + +-# FIXME the headers should be in a package-specific subfolder but can not be for backward compatibility +-install(DIRECTORY include/ ++install(DIRECTORY include/${PROJECT_NAME} + DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h") + +diff --git a/utilities/xmlrpcpp/include/XmlRpc.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h +similarity index 93% +rename from utilities/xmlrpcpp/include/XmlRpc.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h +index 6b00b18..9fd626a 100644 +--- a/utilities/xmlrpcpp/include/XmlRpc.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h +@@ -27,12 +27,12 @@ + # include + #endif + +-#include "XmlRpcClient.h" +-#include "XmlRpcException.h" +-#include "XmlRpcServer.h" +-#include "XmlRpcServerMethod.h" +-#include "XmlRpcValue.h" +-#include "XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcClient.h" ++#include "xmlrpcpp/XmlRpcException.h" ++#include "xmlrpcpp/XmlRpcServer.h" ++#include "xmlrpcpp/XmlRpcServerMethod.h" ++#include "xmlrpcpp/XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcUtil.h" + + #include + +diff --git a/utilities/xmlrpcpp/include/XmlRpcClient.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcClient.h +similarity index 97% +rename from utilities/xmlrpcpp/include/XmlRpcClient.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcClient.h +index 6f47778..2154b39 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcClient.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcClient.h +@@ -13,9 +13,9 @@ + # include + #endif + +-#include "XmlRpcDispatch.h" +-#include "XmlRpcSource.h" +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDispatch.h" ++#include "xmlrpcpp/XmlRpcSource.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/include/XmlRpcDecl.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcDecl.h +similarity index 100% +rename from utilities/xmlrpcpp/include/XmlRpcDecl.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcDecl.h +diff --git a/utilities/xmlrpcpp/include/XmlRpcDispatch.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcDispatch.h +similarity index 98% +rename from utilities/xmlrpcpp/include/XmlRpcDispatch.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcDispatch.h +index 12b01ad..5e90822 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcDispatch.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcDispatch.h +@@ -8,7 +8,7 @@ + # pragma warning(disable:4786) // identifier was truncated in debug info + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + #ifndef MAKEDEPEND + # include +diff --git a/utilities/xmlrpcpp/include/XmlRpcException.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcException.h +similarity index 96% +rename from utilities/xmlrpcpp/include/XmlRpcException.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcException.h +index bff5bf2..4e8a2a6 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcException.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcException.h +@@ -12,7 +12,7 @@ + # include + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + + namespace XmlRpc { +diff --git a/utilities/xmlrpcpp/include/XmlRpcServer.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h +similarity index 96% +rename from utilities/xmlrpcpp/include/XmlRpcServer.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h +index 035d383..ac16dae 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcServer.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h +@@ -16,9 +16,9 @@ + # include + #endif + +-#include "XmlRpcDispatch.h" +-#include "XmlRpcSource.h" +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDispatch.h" ++#include "xmlrpcpp/XmlRpcSource.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/include/XmlRpcServerConnection.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServerConnection.h +similarity index 96% +rename from utilities/xmlrpcpp/include/XmlRpcServerConnection.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServerConnection.h +index f5c224d..ed4d092 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcServerConnection.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServerConnection.h +@@ -11,9 +11,9 @@ + # include + #endif + +-#include "XmlRpcValue.h" +-#include "XmlRpcSource.h" +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcSource.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/include/XmlRpcServerMethod.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServerMethod.h +similarity index 97% +rename from utilities/xmlrpcpp/include/XmlRpcServerMethod.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServerMethod.h +index 7b7ddca..90dddcd 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcServerMethod.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServerMethod.h +@@ -8,7 +8,7 @@ + # pragma warning(disable:4786) // identifier was truncated in debug info + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + #ifndef MAKEDEPEND + # include +diff --git a/utilities/xmlrpcpp/include/XmlRpcSocket.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcSocket.h +similarity index 98% +rename from utilities/xmlrpcpp/include/XmlRpcSocket.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcSocket.h +index 711a520..bc9a530 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcSocket.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcSocket.h +@@ -15,7 +15,7 @@ + # include + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/include/XmlRpcSource.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcSource.h +similarity index 98% +rename from utilities/xmlrpcpp/include/XmlRpcSource.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcSource.h +index f82ccb1..217f416 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcSource.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcSource.h +@@ -8,7 +8,7 @@ + # pragma warning(disable:4786) // identifier was truncated in debug info + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/include/XmlRpcUtil.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h +similarity index 98% +rename from utilities/xmlrpcpp/include/XmlRpcUtil.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h +index 78627f4..acde160 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcUtil.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h +@@ -11,7 +11,7 @@ + # include + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + #if defined(_MSC_VER) + # define snprintf _snprintf_s +diff --git a/utilities/xmlrpcpp/include/XmlRpcValue.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcValue.h +similarity index 99% +rename from utilities/xmlrpcpp/include/XmlRpcValue.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcValue.h +index fe6cb8c..0d72c59 100644 +--- a/utilities/xmlrpcpp/include/XmlRpcValue.h ++++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcValue.h +@@ -8,7 +8,7 @@ + # pragma warning(disable:4786) // identifier was truncated in debug info + #endif + +-#include "XmlRpcDecl.h" ++#include "xmlrpcpp/XmlRpcDecl.h" + + #ifndef MAKEDEPEND + # include +diff --git a/utilities/xmlrpcpp/include/base64.h b/utilities/xmlrpcpp/include/xmlrpcpp/base64.h +similarity index 100% +rename from utilities/xmlrpcpp/include/base64.h +rename to utilities/xmlrpcpp/include/xmlrpcpp/base64.h +diff --git a/utilities/xmlrpcpp/src/XmlRpcClient.cpp b/utilities/xmlrpcpp/src/XmlRpcClient.cpp +index 31cda22..b533059 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcClient.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcClient.cpp +@@ -1,8 +1,8 @@ + +-#include "XmlRpcClient.h" ++#include "xmlrpcpp/XmlRpcClient.h" + +-#include "XmlRpcSocket.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpcSocket.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + #include +diff --git a/utilities/xmlrpcpp/src/XmlRpcDispatch.cpp b/utilities/xmlrpcpp/src/XmlRpcDispatch.cpp +index 1d47836..e92dc5c 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcDispatch.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcDispatch.cpp +@@ -1,7 +1,7 @@ + +-#include "XmlRpcDispatch.h" +-#include "XmlRpcSource.h" +-#include "XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcDispatch.h" ++#include "xmlrpcpp/XmlRpcSource.h" ++#include "xmlrpcpp/XmlRpcUtil.h" + + #include + #include +diff --git a/utilities/xmlrpcpp/src/XmlRpcServer.cpp b/utilities/xmlrpcpp/src/XmlRpcServer.cpp +index 013c6ec..2515142 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcServer.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcServer.cpp +@@ -2,12 +2,12 @@ + // added features: server can be opened on port 0 and you can read back + // what port the OS gave you + +-#include "XmlRpcServer.h" +-#include "XmlRpcServerConnection.h" +-#include "XmlRpcServerMethod.h" +-#include "XmlRpcSocket.h" +-#include "XmlRpcUtil.h" +-#include "XmlRpcException.h" ++#include "xmlrpcpp/XmlRpcServer.h" ++#include "xmlrpcpp/XmlRpcServerConnection.h" ++#include "xmlrpcpp/XmlRpcServerMethod.h" ++#include "xmlrpcpp/XmlRpcSocket.h" ++#include "xmlrpcpp/XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcException.h" + + + using namespace XmlRpc; +diff --git a/utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp b/utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp +index 76b2737..26c997f 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp +@@ -1,8 +1,8 @@ + +-#include "XmlRpcServerConnection.h" ++#include "xmlrpcpp/XmlRpcServerConnection.h" + +-#include "XmlRpcSocket.h" +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpcSocket.h" ++#include "xmlrpcpp/XmlRpc.h" + #ifndef MAKEDEPEND + # include + # include +diff --git a/utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp b/utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp +index 1616ff4..f40447c 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp +@@ -1,6 +1,6 @@ + +-#include "XmlRpcServerMethod.h" +-#include "XmlRpcServer.h" ++#include "xmlrpcpp/XmlRpcServerMethod.h" ++#include "xmlrpcpp/XmlRpcServer.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/src/XmlRpcSocket.cpp b/utilities/xmlrpcpp/src/XmlRpcSocket.cpp +index 916f41d..3f1f731 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcSocket.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcSocket.cpp +@@ -2,8 +2,8 @@ + // added features: server can be opened on port 0 and you can read back + // what port the OS gave you + +-#include "XmlRpcSocket.h" +-#include "XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcSocket.h" ++#include "xmlrpcpp/XmlRpcUtil.h" + + #ifndef MAKEDEPEND + +diff --git a/utilities/xmlrpcpp/src/XmlRpcSource.cpp b/utilities/xmlrpcpp/src/XmlRpcSource.cpp +index 99203b0..4b44625 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcSource.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcSource.cpp +@@ -1,7 +1,7 @@ + +-#include "XmlRpcSource.h" +-#include "XmlRpcSocket.h" +-#include "XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcSource.h" ++#include "xmlrpcpp/XmlRpcSocket.h" ++#include "xmlrpcpp/XmlRpcUtil.h" + + namespace XmlRpc { + +diff --git a/utilities/xmlrpcpp/src/XmlRpcUtil.cpp b/utilities/xmlrpcpp/src/XmlRpcUtil.cpp +index 26f14b2..901ebc8 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcUtil.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcUtil.cpp +@@ -1,5 +1,5 @@ + +-#include "XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcUtil.h" + + #ifndef MAKEDEPEND + # include +@@ -9,7 +9,7 @@ + # include + #endif + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + using namespace XmlRpc; + +diff --git a/utilities/xmlrpcpp/src/XmlRpcValue.cpp b/utilities/xmlrpcpp/src/XmlRpcValue.cpp +index e765cfa..e6dabce 100644 +--- a/utilities/xmlrpcpp/src/XmlRpcValue.cpp ++++ b/utilities/xmlrpcpp/src/XmlRpcValue.cpp +@@ -1,8 +1,8 @@ + +-#include "XmlRpcValue.h" +-#include "XmlRpcException.h" +-#include "XmlRpcUtil.h" +-#include "base64.h" ++#include "xmlrpcpp/XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcException.h" ++#include "xmlrpcpp/XmlRpcUtil.h" ++#include "xmlrpcpp/base64.h" + + #ifndef MAKEDEPEND + # include +diff --git a/utilities/xmlrpcpp/test/FileClient.cpp b/utilities/xmlrpcpp/test/FileClient.cpp +index 81d9f3e..58580f1 100644 +--- a/utilities/xmlrpcpp/test/FileClient.cpp ++++ b/utilities/xmlrpcpp/test/FileClient.cpp +@@ -3,7 +3,7 @@ + // + // Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows) + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + #include + #include + #include +diff --git a/utilities/xmlrpcpp/test/HelloClient.cpp b/utilities/xmlrpcpp/test/HelloClient.cpp +index 576f63c..bcbf9fe 100644 +--- a/utilities/xmlrpcpp/test/HelloClient.cpp ++++ b/utilities/xmlrpcpp/test/HelloClient.cpp +@@ -1,7 +1,7 @@ + // HelloClient.cpp : A simple xmlrpc client. Usage: HelloClient serverHost serverPort + // Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib + // on windows) +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + #include + using namespace XmlRpc; + +diff --git a/utilities/xmlrpcpp/test/HelloServer.cpp b/utilities/xmlrpcpp/test/HelloServer.cpp +index ff81ad8..2a03c6f 100644 +--- a/utilities/xmlrpcpp/test/HelloServer.cpp ++++ b/utilities/xmlrpcpp/test/HelloServer.cpp +@@ -1,6 +1,6 @@ + // HelloServer.cpp : Simple XMLRPC server example. Usage: HelloServer serverPort + // +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + #include +diff --git a/utilities/xmlrpcpp/test/TestBase64Client.cpp b/utilities/xmlrpcpp/test/TestBase64Client.cpp +index de95438..b540d91 100644 +--- a/utilities/xmlrpcpp/test/TestBase64Client.cpp ++++ b/utilities/xmlrpcpp/test/TestBase64Client.cpp +@@ -5,7 +5,7 @@ + // Requests a png file from the specified server and saves it in outputfile. + // Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows) + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + #include + #include + #include +diff --git a/utilities/xmlrpcpp/test/TestBase64Server.cpp b/utilities/xmlrpcpp/test/TestBase64Server.cpp +index 7cb4a63..56ff3aa 100644 +--- a/utilities/xmlrpcpp/test/TestBase64Server.cpp ++++ b/utilities/xmlrpcpp/test/TestBase64Server.cpp +@@ -11,7 +11,7 @@ + #include + + +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + using namespace XmlRpc; + + +diff --git a/utilities/xmlrpcpp/test/TestValues.cpp b/utilities/xmlrpcpp/test/TestValues.cpp +index e770e51..bb7b0d2 100644 +--- a/utilities/xmlrpcpp/test/TestValues.cpp ++++ b/utilities/xmlrpcpp/test/TestValues.cpp +@@ -2,7 +2,7 @@ + + #include + +-#include "XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcValue.h" + + + #include +diff --git a/utilities/xmlrpcpp/test/TestValuesWin32.cpp b/utilities/xmlrpcpp/test/TestValuesWin32.cpp +index f4cdafd..7ccd8c1 100644 +--- a/utilities/xmlrpcpp/test/TestValuesWin32.cpp ++++ b/utilities/xmlrpcpp/test/TestValuesWin32.cpp +@@ -4,7 +4,7 @@ + #include + #include + +-#include "XmlRpcValue.h" ++#include "xmlrpcpp/XmlRpcValue.h" + + + #include +diff --git a/utilities/xmlrpcpp/test/TestXml.cpp b/utilities/xmlrpcpp/test/TestXml.cpp +index 4fa707d..16ffb4a 100644 +--- a/utilities/xmlrpcpp/test/TestXml.cpp ++++ b/utilities/xmlrpcpp/test/TestXml.cpp +@@ -11,7 +11,7 @@ + #include + #include + +-#include "XmlRpcUtil.h" ++#include "xmlrpcpp/XmlRpcUtil.h" + + using namespace XmlRpc; + +diff --git a/utilities/xmlrpcpp/test/Validator.cpp b/utilities/xmlrpcpp/test/Validator.cpp +index 2868a2d..83b3ca4 100644 +--- a/utilities/xmlrpcpp/test/Validator.cpp ++++ b/utilities/xmlrpcpp/test/Validator.cpp +@@ -1,6 +1,6 @@ + // Validator.cpp : XMLRPC server based on the compliancy test at validator.xmlrpc.com. + // +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + using namespace XmlRpc; + + #include +diff --git a/utilities/xmlrpcpp/test/bool_test.cpp b/utilities/xmlrpcpp/test/bool_test.cpp +index db9d414..fbec414 100644 +--- a/utilities/xmlrpcpp/test/bool_test.cpp ++++ b/utilities/xmlrpcpp/test/bool_test.cpp +@@ -1,5 +1,5 @@ + // bool_test.cpp : make sure bool variables copy around ok +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + #include + #include + +diff --git a/utilities/xmlrpcpp/test/port_zero_server.cpp b/utilities/xmlrpcpp/test/port_zero_server.cpp +index 0cb19d8..b60ab45 100644 +--- a/utilities/xmlrpcpp/test/port_zero_server.cpp ++++ b/utilities/xmlrpcpp/test/port_zero_server.cpp +@@ -1,6 +1,6 @@ + // HelloServer.cpp : Simple XMLRPC server example. Usage: HelloServer serverPort + // +-#include "XmlRpc.h" ++#include "xmlrpcpp/XmlRpc.h" + + #include + #include diff -Nru ros-ros-comm-1.11.16/debian/patches/series ros-ros-comm-1.11.16/debian/patches/series --- ros-ros-comm-1.11.16/debian/patches/series 2015-12-22 16:59:31.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/patches/series 2016-01-18 21:50:02.000000000 +0000 @@ -4,3 +4,4 @@ 0004-Fix-executable-not-elf-or-script.patch 0005-Add-defaults-to-roswtf.patch 0006-Fixup-copyrights.patch +0007-xmlrpcpp-move-heaers-to-include-xmlrpcpp.patch diff -Nru ros-ros-comm-1.11.16/debian/rules ros-ros-comm-1.11.16/debian/rules --- ros-ros-comm-1.11.16/debian/rules 2015-11-26 18:08:27.000000000 +0000 +++ ros-ros-comm-1.11.16/debian/rules 2016-01-20 21:25:57.000000000 +0000 @@ -4,7 +4,15 @@ include /usr/share/dpkg/default.mk %: - dh $@ --parallel --with=python2 --buildsystem=cmake + dh $@ --parallel --with=python2 --buildsystem=cmake --builddirectory=build + +# Due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810990 we moved the +# xmlrpcpp includes to /usr/include/xmlrpcpp. As this is different to ROS +# upstream, we add the path to the cmake file, so all includes are found +# without the xmlrpcpp path as well. +override_dh_auto_configure: + dh_auto_configure + sed -i -e 's#set(_include_dirs "include")#set(_include_dirs "include;/usr/include/xmlrpcpp")#' build/utilities/xmlrpcpp/catkin_generated/installspace/xmlrpcppConfig.cmake get-orig-source: uscan --verbose --force-download --repack --compress xz