From 8719c30ea4eb390d1658fb7a57016abae345c4ea Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Tue, 20 Aug 2019 17:47:00 -0700
Subject: [PATCH] don't install header that will be removed

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 gazebo_plugins/src/gazebo_ros_camera.cpp                      | 4 +++-
 gazebo_plugins/src/gazebo_ros_depth_camera.cpp                | 4 +++-
 .../gazebo_plugins => src}/gazebo_ros_depth_camera.hpp        | 0
 gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world      | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename gazebo_plugins/{include/gazebo_plugins => src}/gazebo_ros_depth_camera.hpp (100%)

diff --git a/gazebo_plugins/src/gazebo_ros_camera.cpp b/gazebo_plugins/src/gazebo_ros_camera.cpp
index fc26a8489..93aa9d1aa 100644
--- a/gazebo_plugins/src/gazebo_ros_camera.cpp
+++ b/gazebo_plugins/src/gazebo_ros_camera.cpp
@@ -19,7 +19,6 @@
 
 #include <camera_info_manager/camera_info_manager.h>
 #include <gazebo_plugins/gazebo_ros_camera.hpp>
-#include <gazebo_plugins/gazebo_ros_depth_camera.hpp>
 #include <gazebo_ros/conversions/builtin_interfaces.hpp>
 #include <gazebo_ros/node.hpp>
 #include <gazebo_ros/utils.hpp>
@@ -33,6 +32,9 @@
 #include <mutex>
 #include <string>
 
+// Not installed on Dashing because it will be removed on Eloquent
+#include "gazebo_ros_depth_camera.hpp"
+
 namespace gazebo_plugins
 {
 class GazeboRosCameraPrivate
diff --git a/gazebo_plugins/src/gazebo_ros_depth_camera.cpp b/gazebo_plugins/src/gazebo_ros_depth_camera.cpp
index 1285399db..26b381ee6 100644
--- a/gazebo_plugins/src/gazebo_ros_depth_camera.cpp
+++ b/gazebo_plugins/src/gazebo_ros_depth_camera.cpp
@@ -19,7 +19,6 @@
 #include <ignition/math/Helpers.hh>
 
 #include <camera_info_manager/camera_info_manager.h>
-#include <gazebo_plugins/gazebo_ros_depth_camera.hpp>
 #include <gazebo_ros/conversions/builtin_interfaces.hpp>
 #include <gazebo_ros/node.hpp>
 #include <gazebo_ros/utils.hpp>
@@ -36,6 +35,9 @@
 #include <mutex>
 #include <string>
 
+// Not installed on Dashing because it will be removed on Eloquent
+#include "gazebo_ros_depth_camera.hpp"
+
 #define FLOAT_SIZE sizeof(float)
 
 namespace gazebo_plugins
diff --git a/gazebo_plugins/include/gazebo_plugins/gazebo_ros_depth_camera.hpp b/gazebo_plugins/src/gazebo_ros_depth_camera.hpp
similarity index 100%
rename from gazebo_plugins/include/gazebo_plugins/gazebo_ros_depth_camera.hpp
rename to gazebo_plugins/src/gazebo_ros_depth_camera.hpp
diff --git a/gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world b/gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world
index cc0c9a3f7..deba189bc 100644
--- a/gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world
+++ b/gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world
@@ -158,7 +158,7 @@
             <!-- omit camera_name to default to sensor name -->
             <camera_name>mycamera</camera_name>
 
-            <!-- frame_name>omit so it defaults to link name</frameName-->
+            <!-- frame_name>omit so it defaults to link name</frame_name-->
 
             <min_depth>0.1</min_depth>
             <max_depth>500</max_depth>
@@ -167,4 +167,4 @@
       </link>
     </model>
   </world>
-</sdf>
\ No newline at end of file
+</sdf>