[ros-ros-comm] 04/12: Rebase patches and bump librosbag soname
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Tue Aug 15 16:23:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch old
in repository ros-ros-comm.
commit 46f9a0447869032c2ea0696ecba0e511ef316b12
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Fri Jun 23 20:56:10 2017 +0200
Rebase patches and bump librosbag soname
---
debian/control | 4 +-
.../{librosbag2d.install => librosbag3d.install} | 0
.../patches/0002-Add-Debian-specific-SONAMEs.patch | 34 +-
.../patches/0003-Add-default-ROS_MASTER_URI.patch | 2 +-
debian/patches/0005-Add-defaults-to-roswtf.patch | 24 +-
.../0007-move-heaers-to-include-xmlrpcpp.patch | 772 ---------------------
debian/patches/series | 1 -
7 files changed, 34 insertions(+), 803 deletions(-)
diff --git a/debian/control b/debian/control
index 1908884..844f20b 100644
--- a/debian/control
+++ b/debian/control
@@ -141,13 +141,13 @@ Package: librosbag-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: librosbag2d (= ${binary:Version}), ${misc:Depends}, librosbag-storage-dev, librosconsole-dev, libroscpp-dev, libtopic-tools-dev, libxmlrpcpp-dev
+Depends: librosbag3d (= ${binary:Version}), ${misc:Depends}, librosbag-storage-dev, librosconsole-dev, libroscpp-dev, libtopic-tools-dev, libxmlrpcpp-dev
Description: Tools for recording from and playing back to Robot OS topics
This package is part of Robot OS (ROS). It is the development files
for the rosbag library, which provides APIs for reading/writing bags
(ROS message stores) in C++ and Python.
-Package: librosbag2d
+Package: librosbag3d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: same
diff --git a/debian/librosbag2d.install b/debian/librosbag3d.install
similarity index 100%
rename from debian/librosbag2d.install
rename to debian/librosbag3d.install
diff --git a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
index 5058411..1a2f61e 100644
--- a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
+++ b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
@@ -14,12 +14,12 @@ Subject: Add Debian specific SONAMEs
8 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
-index 6331029..e6b8ff8 100644
+index ad6ccda..eaa01cb 100644
--- a/clients/roscpp/CMakeLists.txt
+++ b/clients/roscpp/CMakeLists.txt
-@@ -119,7 +119,7 @@ add_library(roscpp
- src/libros/service.cpp
+@@ -120,7 +120,7 @@ add_library(roscpp
src/libros/this_node.cpp
+ src/libros/steady_timer.cpp
)
-
+set_target_properties(roscpp PROPERTIES VERSION ${roscpp_VERSION} SOVERSION "1d")
@@ -27,17 +27,17 @@ index 6331029..e6b8ff8 100644
target_link_libraries(roscpp
diff --git a/tools/rosbag/CMakeLists.txt b/tools/rosbag/CMakeLists.txt
-index 8656ac3..2892089 100644
+index 286b14f..0cc0b63 100644
--- a/tools/rosbag/CMakeLists.txt
+++ b/tools/rosbag/CMakeLists.txt
-@@ -25,6 +25,7 @@ add_library(rosbag
+@@ -27,6 +27,7 @@ add_library(rosbag
src/player.cpp
src/recorder.cpp
src/time_translator.cpp)
-+set_target_properties(rosbag PROPERTIES VERSION ${rosbag_VERSION} SOVERSION "2d")
-
- target_link_libraries(rosbag ${catkin_LIBRARIES} ${Boost_LIBRARIES})
++set_target_properties(rosbag PROPERTIES VERSION ${rosbag_VERSION} SOVERSION "3d")
+ target_link_libraries(rosbag ${catkin_LIBRARIES} ${Boost_LIBRARIES}
+ ${BZIP2_LIBRARIES}
diff --git a/tools/rosbag_storage/CMakeLists.txt b/tools/rosbag_storage/CMakeLists.txt
index a951ddb..60b3bc7 100644
--- a/tools/rosbag_storage/CMakeLists.txt
@@ -96,25 +96,25 @@ index 03e906a..b9403b0 100644
install(TARGETS ${PROJECT_NAME}
diff --git a/utilities/roslz4/CMakeLists.txt b/utilities/roslz4/CMakeLists.txt
-index 68f65f7..378303f 100644
+index ae9d75f..b8c15f7 100644
--- a/utilities/roslz4/CMakeLists.txt
+++ b/utilities/roslz4/CMakeLists.txt
-@@ -31,6 +31,7 @@ add_library(roslz4 src/lz4s.c src/xxhash.c)
+@@ -34,6 +34,7 @@ PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
set_source_files_properties(
- src/lz4s.c
- PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
+ src/lz4s.c src/xxhash.c
+ PROPERTIES COMPILE_DEFINITIONS "XXH_NAMESPACE=ROSLZ4_")
+set_target_properties(roslz4 PROPERTIES VERSION ${roslz4_VERSION} SOVERSION "1d")
target_link_libraries(roslz4 ${lz4_LIBRARIES} ${catkin_LIBRARIES})
if(NOT ANDROID)
diff --git a/utilities/xmlrpcpp/CMakeLists.txt b/utilities/xmlrpcpp/CMakeLists.txt
-index dfcd0a5..673a924 100644
+index f063500..ae79cc3 100644
--- a/utilities/xmlrpcpp/CMakeLists.txt
+++ b/utilities/xmlrpcpp/CMakeLists.txt
-@@ -30,6 +30,7 @@ add_library(xmlrpcpp
- src/XmlRpcUtil.cpp
- src/XmlRpcValue.cpp
- )
+@@ -39,6 +39,7 @@ add_library(xmlrpcpp
+ libb64/src/cdecode.c
+ libb64/src/cencode.c
+ )
+set_target_properties(xmlrpcpp PROPERTIES VERSION ${xmlrpcpp_VERSION} SOVERSION "1d")
if(WIN32)
diff --git a/debian/patches/0003-Add-default-ROS_MASTER_URI.patch b/debian/patches/0003-Add-default-ROS_MASTER_URI.patch
index 1870c70..0ed357e 100644
--- a/debian/patches/0003-Add-default-ROS_MASTER_URI.patch
+++ b/debian/patches/0003-Add-default-ROS_MASTER_URI.patch
@@ -8,7 +8,7 @@ Subject: Add default ROS_MASTER_URI
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/clients/roscpp/src/libros/master.cpp b/clients/roscpp/src/libros/master.cpp
-index d0e4ef4..c25be66 100644
+index c0e2e10..cbb2a67 100644
--- a/clients/roscpp/src/libros/master.cpp
+++ b/clients/roscpp/src/libros/master.cpp
@@ -63,19 +63,15 @@ void init(const M_string& remappings)
diff --git a/debian/patches/0005-Add-defaults-to-roswtf.patch b/debian/patches/0005-Add-defaults-to-roswtf.patch
index d194bd6..5f92e9b 100644
--- a/debian/patches/0005-Add-defaults-to-roswtf.patch
+++ b/debian/patches/0005-Add-defaults-to-roswtf.patch
@@ -5,8 +5,8 @@ Subject: Add defaults to roswtf
---
utilities/roswtf/src/roswtf/__init__.py | 2 +-
utilities/roswtf/src/roswtf/context.py | 8 ++++----
- utilities/roswtf/src/roswtf/rosdep_db.py | 4 ++--
- 3 files changed, 7 insertions(+), 7 deletions(-)
+ utilities/roswtf/src/roswtf/rosdep_db.py | 8 ++++----
+ 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/utilities/roswtf/src/roswtf/__init__.py b/utilities/roswtf/src/roswtf/__init__.py
index 8527cfb..ac2da80 100644
@@ -42,18 +42,22 @@ index fdab98d..82f0e3b 100644
diff --git a/utilities/roswtf/src/roswtf/rosdep_db.py b/utilities/roswtf/src/roswtf/rosdep_db.py
-index 3173a91..b166e53 100644
+index 285dab8..f783793 100644
--- a/utilities/roswtf/src/roswtf/rosdep_db.py
+++ b/utilities/roswtf/src/roswtf/rosdep_db.py
-@@ -46,9 +46,9 @@ def rosdep_database_initialized_check(ctx):
- if not os.path.exists((os.path.join(get_user_home_directory(), '.ros', 'rosdep', 'sources.cache', 'index'))):
- return "Please initialize rosdep database with sudo rosdep init."
+@@ -47,11 +47,11 @@ def rosdep_database_updated_check(ctx):
+ return "Please update rosdep database with 'rosdep update'."
+
-warnings = []
+errors = []
--errors = [(rosdep_database_initialized_check,
-+warnings = [(rosdep_database_initialized_check,
- "ROS Dep database not initialized: "),
- ]
+-errors = [(rosdep_database_updated_check,
+- "ROS Dep database not updated: "),
+- ]
++warnings = [(rosdep_database_updated_check,
++ "ROS Dep database not updated: "),
++ ]
+
+ def wtf_check(ctx):
diff --git a/debian/patches/0007-move-heaers-to-include-xmlrpcpp.patch b/debian/patches/0007-move-heaers-to-include-xmlrpcpp.patch
deleted file mode 100644
index 15ecad5..0000000
--- a/debian/patches/0007-move-heaers-to-include-xmlrpcpp.patch
+++ /dev/null
@@ -1,772 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-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 4f4c1df..6380114 100644
---- a/clients/roscpp/include/ros/node_handle.h
-+++ b/clients/roscpp/include/ros/node_handle.h
-@@ -48,7 +48,7 @@
-
- #include <boost/bind.hpp>
-
--#include <XmlRpcValue.h>
-+#include <xmlrpcpp/XmlRpcValue.h>
-
- namespace ros
- {
-diff --git a/clients/roscpp/include/ros/param.h b/clients/roscpp/include/ros/param.h
-index cfa7521..699f212 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 <vector>
- #include <map>
-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 <boost/thread/mutex.hpp>
-
-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 <boost/thread/mutex.hpp>
-
-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 <boost/thread.hpp>
- #include <boost/shared_ptr.hpp>
-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 <boost/thread/mutex.hpp>
- #include <boost/thread/recursive_mutex.hpp>
-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 <boost/enable_shared_from_this.hpp>
-
- #include "common.h"
--#include "XmlRpc.h"
-+#include "xmlrpcpp/XmlRpc.h"
-
- #include <ros/time.h>
-
-diff --git a/clients/roscpp/src/libros/init.cpp b/clients/roscpp/src/libros/init.cpp
-index 8837898..91e0a58 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 <ros/console.h>
- #include <ros/assert.h>
-
--#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 6673d48..7dc0797 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 <boost/thread.hpp>
-
-diff --git a/clients/roscpp/src/libros/service_manager.cpp b/clients/roscpp/src/libros/service_manager.cpp
-index 2bdb022..1f1e94a 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 <ros/console.h>
-
-diff --git a/clients/roscpp/src/libros/topic_manager.cpp b/clients/roscpp/src/libros/topic_manager.cpp
-index 3d77e7c..363fb05 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 <ros/console.h>
-
-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 c0c4602..77a9b91 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 673a924..79b4516 100644
---- a/utilities/xmlrpcpp/CMakeLists.txt
-+++ b/utilities/xmlrpcpp/CMakeLists.txt
-@@ -36,8 +36,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 <string>
- #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 <stdexcept>
-
-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 <string>
- #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 <list>
-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 <string>
- #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 <string>
- #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 <string>
- #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 <string>
-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 <string>
- #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 <string>
- #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 <map>
-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 <stdio.h>
- #include <stdlib.h>
-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 <math.h>
- #include <errno.h>
-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 <stdio.h>
- # include <stdlib.h>
-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 b3c694b..8173fc9 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 <ctype.h>
-@@ -9,7 +9,7 @@
- # include <string.h>
- #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 <iostream>
-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 <iostream>
- #include <fstream>
- #include <stdlib.h>
-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 <iostream>
- 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 <iostream>
- #include <stdlib.h>
-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 <iostream>
- #include <fstream>
- #include <stdlib.h>
-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 <stdlib.h>
-
-
--#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 <stdlib.h>
-
--#include "XmlRpcValue.h"
-+#include "xmlrpcpp/XmlRpcValue.h"
-
-
- #include <assert.h>
-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 <stdlib.h>
- #include <crtdbg.h>
-
--#include "XmlRpcValue.h"
-+#include "xmlrpcpp/XmlRpcValue.h"
-
-
- #include <assert.h>
-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 <assert.h>
- #include <stdlib.h>
-
--#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 <iostream>
-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 <iostream>
- #include <stdlib.h>
-
-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 <iostream>
- #include <stdlib.h>
diff --git a/debian/patches/series b/debian/patches/series
index bb74494..f49d041 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
0003-Add-default-ROS_MASTER_URI.patch
0004-Fix-executable-not-elf-or-script.patch
0005-Add-defaults-to-roswtf.patch
-0007-move-heaers-to-include-xmlrpcpp.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-ros-comm.git
More information about the debian-science-commits
mailing list