From 371bf7d78939681dbc0a61e617f302bfe5f4a472 Mon Sep 17 00:00:00 2001
From: Paul Bovbel <pbovbel@locusrobotics.com>
Date: Mon, 30 Apr 2018 12:03:07 -0400
Subject: [PATCH] Fix build and update maintainers

---
 pcl_conversions/CMakeLists.txt | 10 +++++++---
 pcl_conversions/package.xml    |  5 +++--
 pcl_ros/package.xml            |  4 +++-
 perception_pcl/package.xml     | 16 +++++++++-------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pcl_conversions/CMakeLists.txt b/pcl_conversions/CMakeLists.txt
index 61e72446..7781f3b9 100644
--- a/pcl_conversions/CMakeLists.txt
+++ b/pcl_conversions/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(pcl_conversions)
 
-find_package(catkin REQUIRED COMPONENTS pcl_msgs roscpp sensor_msgs std_msgs)
+find_package(catkin REQUIRED COMPONENTS)
 
 find_package(PCL REQUIRED COMPONENTS common io)
 find_package(Eigen3 REQUIRED)
@@ -9,7 +9,7 @@ find_package(Eigen3 REQUIRED)
 catkin_package(
   INCLUDE_DIRS include
   CATKIN_DEPENDS pcl_msgs roscpp sensor_msgs std_msgs
-  DEPENDS Eigen3 PCL
+  DEPENDS EIGEN3 PCL
 )
 
 install(DIRECTORY include/${PROJECT_NAME}/
@@ -17,11 +17,15 @@ install(DIRECTORY include/${PROJECT_NAME}/
 )
 
 if(CATKIN_ENABLE_TESTING)
+  find_package(pcl_msgs)
+  find_package(roscpp)
+  find_package(sensor_msgs )
+  find_package(std_msgs)
   include_directories(
     include
     ${catkin_INCLUDE_DIRS}
     ${PCL_INCLUDE_DIRS}
-    ${Eigen3_INCLUDE_DIRS})
+    ${EIGEN3_INCLUDE_DIRS})
 
   catkin_add_gtest(test_pcl_conversions test/test_pcl_conversions.cpp)
   target_link_libraries(test_pcl_conversions ${catkin_LIBRARIES})
diff --git a/pcl_conversions/package.xml b/pcl_conversions/package.xml
index d33d5175..37b93dca 100644
--- a/pcl_conversions/package.xml
+++ b/pcl_conversions/package.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>pcl_conversions</name>
-  <version>0.2.1</version>
+  <version>1.5.4</version>
   <description>Provides conversions from PCL data types and ROS message types</description>
 
   <author email="william@osrfoundation.org">William Woodall</author>
+
   <maintainer email="paul@bovbel.com">Paul Bovbel</maintainer>
-  <maintainer email="bill@neautomation.com">Bill Morris</maintainer>
+  <maintainer email="www.kentaro.wada@gmail.com">Kentaro Wada</maintainer>
 
   <license>BSD</license>
 
diff --git a/pcl_ros/package.xml b/pcl_ros/package.xml
index 4e0cf8e0..2e28d5e0 100644
--- a/pcl_ros/package.xml
+++ b/pcl_ros/package.xml
@@ -13,10 +13,12 @@
   <author>Open Perception</author>
   <author email="julius@kammerl.de">Julius Kammerl</author>
   <author email="william@osrfoundation.org">William Woodall</author>
+
   <maintainer email="paul@bovbel.com">Paul Bovbel</maintainer>
-  <maintainer email="bill@neautomation.com">Bill Morris</maintainer>
   <maintainer email="www.kentaro.wada@gmail.com">Kentaro Wada</maintainer>
+
   <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/perception_pcl</url>
   <url type="bugtracker">https://github.com/ros-perception/perception_pcl/issues</url>
   <url type="repository">https://github.com/ros-perception/perception_pcl</url>
diff --git a/perception_pcl/package.xml b/perception_pcl/package.xml
index 59713e50..31bb53fd 100644
--- a/perception_pcl/package.xml
+++ b/perception_pcl/package.xml
@@ -1,29 +1,31 @@
-<package>
+<package format="2">
   <name>perception_pcl</name>
   <version>1.5.4</version>
   <description>
-
   PCL (Point Cloud Library) ROS interface stack. PCL-ROS is the preferred
   bridge for 3D applications involving n-D Point Clouds and 3D geometry
   processing in ROS.
-
   </description>
+
   <author>Open Perception</author>
   <author email="william@osrfoundation.org">William Woodall</author>
   <author email="julius@kammerl.de">Julius Kammerl</author>
+
   <maintainer email="paul@bovbel.com">Paul Bovbel</maintainer>
-  <maintainer email="bill@neautomation.com">Bill Morris</maintainer>
   <maintainer email="www.kentaro.wada@gmail.com">Kentaro Wada</maintainer>
+
   <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/perception_pcl</url>
   <url type="bugtracker">https://github.com/ros-perception/perception_pcl/issues</url>
   <url type="repository">https://github.com/ros-perception/perception_pcl</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <run_depend>pcl_conversions</run_depend>
-  <run_depend>pcl_msgs</run_depend>
-  <run_depend>pcl_ros</run_depend>
+  <exec_depend>pcl_conversions</exec_depend>
+  <exec_depend>pcl_msgs</exec_depend>
+  <exec_depend>pcl_ros</exec_depend>
+
   <export>
     <metapackage/>
   </export>