[ros-geometry] 02/02: 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-geometry.

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

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

diff --git a/debian/control b/debian/control
index d6f58b5..19234cc 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
 		libgeometry-msgs-dev, libactionlib-msgs-dev,
 		libconsole-bridge-dev, python-rospy, libpython-dev,
 		libactionlib-dev, librosconsole-dev,
-		libros-rosgraph-msgs-dev, libxmlrpcpp-dev (>= 1.11.16-3),
+		libros-rosgraph-msgs-dev, libxmlrpcpp-dev,
 		libmessage-filters-dev, ros-cmake-modules, libeigen3-dev,
 		liborocos-kdl-dev, libsensor-msgs-dev, libbullet-dev,
 		libboost-dev, libboost-thread-dev, libboost-signals-dev,
diff --git a/debian/patches/0004-Adopt-to-new-path-of-xmlrpcpp-includes.patch b/debian/patches/0004-Adopt-to-new-path-of-xmlrpcpp-includes.patch
deleted file mode 100644
index 8dd983c..0000000
--- a/debian/patches/0004-Adopt-to-new-path-of-xmlrpcpp-includes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sat, 16 Jan 2016 14:50:09 +0100
-Subject: Adopt to new path of xmlrpcpp includes
-
----
- tf/src/change_notifier.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tf/src/change_notifier.cpp b/tf/src/change_notifier.cpp
-index 113cdd4..682ee23 100644
---- a/tf/src/change_notifier.cpp
-+++ b/tf/src/change_notifier.cpp
-@@ -31,7 +31,7 @@
- 
- #include "ros/ros.h"
- #include "tf/transform_listener.h"
--#include "XmlRpcValue.h"
-+#include "xmlrpcpp/XmlRpcValue.h"
- 
- class FramePair
- {
diff --git a/debian/patches/series b/debian/patches/series
index 3539326..cd64645 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Added-CMakeLists-to-build-thepackage.patch
 0002-Deleted-unneeded-dependency.patch
 0003-Add-Debian-specific-SONAME.patch
-0004-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-geometry.git