[ros-gazebo-ros-pkgs] 02/02: Cleanup plugins
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Mon Dec 12 16:33:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch master
in repository ros-gazebo-ros-pkgs.
commit beb70cf759d70fc5f1bc7404729fe2be1f101d02
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon Dec 12 16:07:12 2016 +0100
Cleanup plugins
---
debian/control | 6 +-
debian/libgazebo-plugins0d.install | 33 ----
debian/libgazebo-ros-plugins-dev.install | 3 +
...s-dev.install => libgazebo-ros-plugins.install} | 9 +-
.../patches/0002-Add-Debian-specific-SONAMEs.patch | 174 ---------------------
debian/patches/series | 1 -
6 files changed, 9 insertions(+), 217 deletions(-)
diff --git a/debian/control b/debian/control
index aded156..694ddf1 100644
--- a/debian/control
+++ b/debian/control
@@ -39,15 +39,15 @@ Description: LISP code for gazebo_msgs Robot OS Messages
.
This package contains the generated LISP library.
-Package: libgazebo-plugins-dev
+Package: libgazebo-ros-plugins-dev
Section: libdevel
Architecture: any
-Depends: libgazebo-plugins0d (= ${binary:Version}), ${misc:Depends}
+Depends: libgazebo-ros-plugins, ${misc:Depends}
Description: development files for gazebo_plugins (Robot OS)
This package is part of Robot OS (ROS). Robot-independent Gazebo plugins for
sensors, motors and dynamic reconfigurable components.
-Package: libgazebo-plugins0d
+Package: libgazebo-ros-plugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: runtime files for gazebo_plugins (Robot OS)
diff --git a/debian/libgazebo-plugins0d.install b/debian/libgazebo-plugins0d.install
deleted file mode 100644
index 112f893..0000000
--- a/debian/libgazebo-plugins0d.install
+++ /dev/null
@@ -1,33 +0,0 @@
-usr/lib/*/libgazebo_ros_block_laser.so.*
-usr/lib/*/libgazebo_ros_bumper.so.*
-usr/lib/*/libgazebo_ros_camera.so.*
-usr/lib/*/libgazebo_ros_camera_utils.so.*
-usr/lib/*/libgazebo_ros_depth_camera.so.*
-usr/lib/*/libgazebo_ros_diff_drive.so.*
-usr/lib/*/libgazebo_ros_elevator.so.*
-usr/lib/*/libgazebo_ros_f3d.so.*
-usr/lib/*/libgazebo_ros_force.so.*
-usr/lib/*/libgazebo_ros_ft_sensor.so.*
-usr/lib/*/libgazebo_ros_gpu_laser.so.*
-usr/lib/*/libgazebo_ros_hand_of_god.so.*
-usr/lib/*/libgazebo_ros_imu.so.*
-usr/lib/*/libgazebo_ros_joint_pose_trajectory.so.*
-usr/lib/*/libgazebo_ros_joint_state_publisher.so.*
-usr/lib/*/libgazebo_ros_joint_trajectory.so.*
-usr/lib/*/libgazebo_ros_laser.so.*
-usr/lib/*/libgazebo_ros_multicamera.so.*
-usr/lib/*/libgazebo_ros_openni_kinect.so.*
-usr/lib/*/libgazebo_ros_p3d.so.*
-usr/lib/*/libgazebo_ros_planar_move.so.*
-usr/lib/*/libgazebo_ros_projector.so.*
-usr/lib/*/libgazebo_ros_prosilica.so.*
-usr/lib/*/libgazebo_ros_range.so.*
-usr/lib/*/libgazebo_ros_skid_steer_drive.so.*
-usr/lib/*/libgazebo_ros_template.so.*
-usr/lib/*/libgazebo_ros_tricycle_drive.so.*
-usr/lib/*/libgazebo_ros_utils.so.*
-usr/lib/*/libgazebo_ros_video.so.*
-usr/lib/*/libMultiCameraPlugin.so.*
-usr/lib/*/libvision_reconfigure.so.*
-usr/share/gazebo_plugins/Media
-usr/share/gazebo_plugins/test
diff --git a/debian/libgazebo-ros-plugins-dev.install b/debian/libgazebo-ros-plugins-dev.install
new file mode 100644
index 0000000..2bc3888
--- /dev/null
+++ b/debian/libgazebo-ros-plugins-dev.install
@@ -0,0 +1,3 @@
+usr/include/gazebo_plugins
+usr/lib/gazebo_plugins
+usr/share/gazebo_plugins/cmake
diff --git a/debian/libgazebo-plugins-dev.install b/debian/libgazebo-ros-plugins.install
similarity index 85%
rename from debian/libgazebo-plugins-dev.install
rename to debian/libgazebo-ros-plugins.install
index 30e820c..47255d0 100644
--- a/debian/libgazebo-plugins-dev.install
+++ b/debian/libgazebo-ros-plugins.install
@@ -1,5 +1,3 @@
-usr/include/gazebo_plugins
-usr/lib/gazebo_plugins
usr/lib/*/libgazebo_ros_block_laser.so
usr/lib/*/libgazebo_ros_bumper.so
usr/lib/*/libgazebo_ros_camera.so
@@ -29,8 +27,7 @@ usr/lib/*/libgazebo_ros_template.so
usr/lib/*/libgazebo_ros_tricycle_drive.so
usr/lib/*/libgazebo_ros_utils.so
usr/lib/*/libgazebo_ros_video.so
-usr/lib/*/libMultiCameraPlugin.so
-usr/lib/*/libvision_reconfigure.so
-usr/lib/*/pkgconfig/gazebo_plugins.pc
-usr/share/gazebo_plugins/cmake
+usr/lib/*/libgazebo_ros_vacuum_gripper.so
+usr/share/gazebo_plugins/Media
+usr/share/gazebo_plugins/test
usr/share/gazebo_plugins/package.xml
diff --git a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
deleted file mode 100644
index 55506c8..0000000
--- a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 25 Oct 2016 16:43:36 +0200
-Subject: Add Debian specific SONAMEs
-
----
- gazebo_plugins/CMakeLists.txt | 33 ++++++++++++++++++++++++++++++++-
- 1 file changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/gazebo_plugins/CMakeLists.txt b/gazebo_plugins/CMakeLists.txt
-index 2a6a14b..5ea021c 100644
---- a/gazebo_plugins/CMakeLists.txt
-+++ b/gazebo_plugins/CMakeLists.txt
-@@ -154,10 +154,12 @@ target_link_libraries(hokuyo_node
-
- add_library(gazebo_ros_utils src/gazebo_ros_utils.cpp)
- target_link_libraries(gazebo_ros_utils ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_utils PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(vision_reconfigure src/vision_reconfigure.cpp)
- add_dependencies(vision_reconfigure ${PROJECT_NAME}_gencfg)
- target_link_libraries(vision_reconfigure ${catkin_LIBRARIES})
-+set_target_properties(vision_reconfigure PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_executable(camera_synchronizer src/camera_synchronizer.cpp)
- add_dependencies(camera_synchronizer ${PROJECT_NAME}_gencfg)
-@@ -173,34 +175,42 @@ add_definitions(-fPIC) # what is this for?
- add_library(gazebo_ros_camera_utils src/gazebo_ros_camera_utils.cpp)
- add_dependencies(gazebo_ros_camera_utils ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_camera_utils PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(MultiCameraPlugin src/MultiCameraPlugin.cpp)
- target_link_libraries(MultiCameraPlugin ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(MultiCameraPlugin PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_camera src/gazebo_ros_camera.cpp)
- add_dependencies(gazebo_ros_camera ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_camera gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} CameraPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_camera PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- if (NOT GAZEBO_VERSION VERSION_LESS 6.0)
- add_library(gazebo_ros_elevator src/gazebo_ros_elevator.cpp)
- add_dependencies(gazebo_ros_elevator ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_elevator ${GAZEBO_LIBRARIES} ElevatorPlugin ${catkin_LIBRARIES})
-+ set_target_properties(gazebo_ros_elevator PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
- endif()
-
- add_library(gazebo_ros_multicamera src/gazebo_ros_multicamera.cpp)
- add_dependencies(gazebo_ros_multicamera ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_multicamera gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} MultiCameraPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_multicamera PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_depth_camera src/gazebo_ros_depth_camera.cpp)
- add_dependencies(gazebo_ros_depth_camera ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_depth_camera gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} DepthCameraPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_depth_camera PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_openni_kinect src/gazebo_ros_openni_kinect.cpp)
- add_dependencies(gazebo_ros_openni_kinect ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_openni_kinect gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} DepthCameraPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_openni_kinect PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_gpu_laser src/gazebo_ros_gpu_laser.cpp)
- target_link_libraries(gazebo_ros_gpu_laser ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES} GpuRayPlugin)
-+set_target_properties(gazebo_ros_gpu_laser PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- if (NOT GAZEBO_VERSION VERSION_LESS 7.3)
- add_library(gazebo_ros_harness src/gazebo_ros_harness.cpp)
-@@ -211,76 +221,96 @@ endif()
-
- add_library(gazebo_ros_laser src/gazebo_ros_laser.cpp)
- target_link_libraries(gazebo_ros_laser ${GAZEBO_LIBRARIES} RayPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_laser PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_block_laser src/gazebo_ros_block_laser.cpp)
- target_link_libraries(gazebo_ros_block_laser ${GAZEBO_LIBRARIES} RayPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_block_laser PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_p3d src/gazebo_ros_p3d.cpp)
- target_link_libraries(gazebo_ros_p3d ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_p3d PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_imu src/gazebo_ros_imu.cpp)
- target_link_libraries(gazebo_ros_imu ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_imu PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_f3d src/gazebo_ros_f3d.cpp)
- target_link_libraries(gazebo_ros_f3d ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_f3d PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_bumper src/gazebo_ros_bumper.cpp)
- add_dependencies(gazebo_ros_bumper ${catkin_EXPORTED_TARGETS})
- target_link_libraries(gazebo_ros_bumper ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} ContactPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_bumper PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_projector src/gazebo_ros_projector.cpp)
- target_link_libraries(gazebo_ros_projector ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_projector PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_prosilica src/gazebo_ros_prosilica.cpp)
- add_dependencies(gazebo_ros_prosilica ${PROJECT_NAME}_gencfg)
- target_link_libraries(gazebo_ros_prosilica gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} CameraPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_prosilica PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_force src/gazebo_ros_force.cpp)
- target_link_libraries(gazebo_ros_force ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_force PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_joint_trajectory src/gazebo_ros_joint_trajectory.cpp)
- add_dependencies(gazebo_ros_joint_trajectory ${catkin_EXPORTED_TARGETS})
- target_link_libraries(gazebo_ros_joint_trajectory ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
--
-+set_target_properties(gazebo_ros_joint_trajectory PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_joint_state_publisher src/gazebo_ros_joint_state_publisher.cpp)
- set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES LINK_FLAGS "${ld_flags}")
- set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES COMPILE_FLAGS "${cxx_flags}")
-+set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
- add_dependencies(gazebo_ros_joint_state_publisher ${catkin_EXPORTED_TARGETS})
- target_link_libraries(gazebo_ros_joint_state_publisher ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-
- add_library(gazebo_ros_joint_pose_trajectory src/gazebo_ros_joint_pose_trajectory.cpp)
- add_dependencies(gazebo_ros_joint_pose_trajectory ${catkin_EXPORTED_TARGETS})
- target_link_libraries(gazebo_ros_joint_pose_trajectory ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_joint_pose_trajectory PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_diff_drive src/gazebo_ros_diff_drive.cpp)
- target_link_libraries(gazebo_ros_diff_drive gazebo_ros_utils ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_diff_drive PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_tricycle_drive src/gazebo_ros_tricycle_drive.cpp)
- target_link_libraries(gazebo_ros_tricycle_drive gazebo_ros_utils ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_tricycle_drive PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_skid_steer_drive src/gazebo_ros_skid_steer_drive.cpp)
- target_link_libraries(gazebo_ros_skid_steer_drive ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_skid_steer_drive PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_video src/gazebo_ros_video.cpp)
- target_link_libraries(gazebo_ros_video ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${OGRE_LIBRARIES})
-+set_target_properties(gazebo_ros_video PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_planar_move src/gazebo_ros_planar_move.cpp)
- target_link_libraries(gazebo_ros_planar_move ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_planar_move PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_hand_of_god src/gazebo_ros_hand_of_god.cpp)
- set_target_properties(gazebo_ros_hand_of_god PROPERTIES LINK_FLAGS "${ld_flags}")
- set_target_properties(gazebo_ros_hand_of_god PROPERTIES COMPILE_FLAGS "${cxx_flags}")
- target_link_libraries(gazebo_ros_hand_of_god ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_hand_of_god PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_ft_sensor src/gazebo_ros_ft_sensor.cpp)
- target_link_libraries(gazebo_ros_ft_sensor ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_ft_sensor PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_range src/gazebo_ros_range.cpp)
- target_link_libraries(gazebo_ros_range ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} RayPlugin)
-+set_target_properties(gazebo_ros_range PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_vacuum_gripper src/gazebo_ros_vacuum_gripper.cpp)
- target_link_libraries(gazebo_ros_vacuum_gripper ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_vacuum_gripper PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- ##
- ## Add your new plugin here
-@@ -289,6 +319,7 @@ target_link_libraries(gazebo_ros_vacuum_gripper ${GAZEBO_LIBRARIES} ${catkin_LIB
- ## Template
- add_library(gazebo_ros_template src/gazebo_ros_template.cpp)
- target_link_libraries(gazebo_ros_template ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_template PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
- install(TARGETS
- hokuyo_node
diff --git a/debian/patches/series b/debian/patches/series
index db23998..5a34ca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-Add-CMakeLists.txt.patch
-0002-Add-Debian-specific-SONAMEs.patch
0005-Change-boost-shared_ptr-to-urdf-JointConstSharedPtr.patch
0006-Hardcode-Gazebo-path-to-usr.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-gazebo-ros-pkgs.git
More information about the debian-science-commits
mailing list