[ros-diagnostics] 01/01: Revert "Add patch for new xmlrpcpp include path"

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-diagnostics.

commit f9559d33000680deaf18641828f5edff373df11b
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Jan 18 23:59:48 2016 +0100

    Revert "Add patch for new xmlrpcpp include path"
    
    This reverts commit 3d77dae884517f988a6fe9d724ee82cda85549fc.
---
 debian/control                                     |  2 +-
 ...03-Adopt-to-new-path-of-xmlrpcpp-includes.patch | 49 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/debian/control b/debian/control
index 53bb03a..3a2ba7f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
            Jochen Sprickerhof <debian at jochen.sprickerhof.de>,
            Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3), dh-python, libdiagnostic-msgs-dev, pluginlib-dev, libroscpp-dev, python-rospy, librostest-dev, librosbag-dev, libxmlrpcpp-dev (>= 1.11.16-3)
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3), dh-python, libdiagnostic-msgs-dev, pluginlib-dev, libroscpp-dev, python-rospy, librostest-dev, librosbag-dev
 Standards-Version: 3.9.6
 Homepage: http://wiki.ros.org/diagnostics
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/ros-diagnostics.git
diff --git a/debian/patches/0003-Adopt-to-new-path-of-xmlrpcpp-includes.patch b/debian/patches/0003-Adopt-to-new-path-of-xmlrpcpp-includes.patch
deleted file mode 100644
index 8737054..0000000
--- a/debian/patches/0003-Adopt-to-new-path-of-xmlrpcpp-includes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sat, 16 Jan 2016 15:00:46 +0100
-Subject: Adopt to new path of xmlrpcpp includes
-
----
- diagnostic_aggregator/include/diagnostic_aggregator/aggregator.h       | 2 +-
- diagnostic_aggregator/include/diagnostic_aggregator/analyzer_group.h   | 2 +-
- diagnostic_aggregator/include/diagnostic_aggregator/generic_analyzer.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/diagnostic_aggregator/include/diagnostic_aggregator/aggregator.h b/diagnostic_aggregator/include/diagnostic_aggregator/aggregator.h
-index 9809ecb..cfef017 100644
---- a/diagnostic_aggregator/include/diagnostic_aggregator/aggregator.h
-+++ b/diagnostic_aggregator/include/diagnostic_aggregator/aggregator.h
-@@ -48,7 +48,7 @@
- #include <diagnostic_msgs/DiagnosticArray.h>
- #include <diagnostic_msgs/DiagnosticStatus.h>
- #include <diagnostic_msgs/KeyValue.h>
--#include "XmlRpcValue.h"
-+#include "xmlrpcpp/XmlRpcValue.h"
- #include "diagnostic_aggregator/analyzer.h"
- #include "diagnostic_aggregator/analyzer_group.h"
- #include "diagnostic_aggregator/status_item.h"
-diff --git a/diagnostic_aggregator/include/diagnostic_aggregator/analyzer_group.h b/diagnostic_aggregator/include/diagnostic_aggregator/analyzer_group.h
-index 09a220a..c00e89c 100644
---- a/diagnostic_aggregator/include/diagnostic_aggregator/analyzer_group.h
-+++ b/diagnostic_aggregator/include/diagnostic_aggregator/analyzer_group.h
-@@ -47,7 +47,7 @@
- #include <diagnostic_msgs/KeyValue.h>
- #include "diagnostic_aggregator/status_item.h"
- #include <boost/shared_ptr.hpp>
--#include "XmlRpcValue.h"
-+#include "xmlrpcpp/XmlRpcValue.h"
- #include "diagnostic_aggregator/analyzer.h"
- #include "diagnostic_aggregator/status_item.h"
- #include "pluginlib/class_loader.h"
-diff --git a/diagnostic_aggregator/include/diagnostic_aggregator/generic_analyzer.h b/diagnostic_aggregator/include/diagnostic_aggregator/generic_analyzer.h
-index 276b44f..964bc62 100644
---- a/diagnostic_aggregator/include/diagnostic_aggregator/generic_analyzer.h
-+++ b/diagnostic_aggregator/include/diagnostic_aggregator/generic_analyzer.h
-@@ -52,7 +52,7 @@
- #include "diagnostic_aggregator/analyzer.h"
- #include "diagnostic_aggregator/status_item.h"
- #include "diagnostic_aggregator/generic_analyzer_base.h"
--#include "XmlRpcValue.h"
-+#include "xmlrpcpp/XmlRpcValue.h"
- 
- namespace diagnostic_aggregator {
- 
diff --git a/debian/patches/series b/debian/patches/series
index d67bf76..c0916ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
-0003-Adopt-to-new-path-of-xmlrpcpp-includes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-diagnostics.git