[ros-gazebo-ros-pkgs] 01/02: Make gazebo_ros_control a plugin packge

[Jochen Sprickerhof]

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 3767309d5782b7bc6884caf9b5e332479dfde973
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Dec 10 10:28:22 2016 +0100

    Make gazebo_ros_control a plugin packge
---
 debian/control                                     |  4 ++--
 debian/libgazebo-ros-control-dev.install           |  2 --
 debian/libgazebo-ros-control.install               |  4 ++++
 debian/libgazebo-ros-control0d.install             |  3 ---
 .../patches/0004-Add-Debian-specific-SONAMEs.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 6 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index a2eb2f4..aded156 100644
--- a/debian/control
+++ b/debian/control
@@ -88,11 +88,11 @@ Description: Python files for gazebo_ros (Robot OS)
 Package: libgazebo-ros-control-dev
 Section: libdevel
 Architecture: any
-Depends: libgazebo-ros-control0d (= ${binary:Version}), ${misc:Depends}
+Depends: libgazebo-ros-control, ${misc:Depends}
 Description: development files for gazebo_ros_control (Robot OS)
  This package is part of Robot OS (ROS).
 
-Package: libgazebo-ros-control0d
+Package: libgazebo-ros-control
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: runtime files for gazebo_ros_control (Robot OS)
diff --git a/debian/libgazebo-ros-control-dev.install b/debian/libgazebo-ros-control-dev.install
index d3beec0..87f8b50 100644
--- a/debian/libgazebo-ros-control-dev.install
+++ b/debian/libgazebo-ros-control-dev.install
@@ -1,5 +1,3 @@
 usr/include/gazebo_ros_control
-usr/lib/*/libgazebo_ros_control.so
 usr/lib/*/pkgconfig/gazebo_ros_control.pc
 usr/share/gazebo_ros_control/cmake
-usr/share/gazebo_ros_control/package.xml
diff --git a/debian/libgazebo-ros-control.install b/debian/libgazebo-ros-control.install
new file mode 100644
index 0000000..7455cd6
--- /dev/null
+++ b/debian/libgazebo-ros-control.install
@@ -0,0 +1,4 @@
+usr/lib/*/libgazebo_ros_control.so
+usr/lib/*/libdefault_robot_hw_sim.so /usr/lib
+usr/share/gazebo_ros_control/robot_hw_sim_plugins.xml
+usr/share/gazebo_ros_control/package.xml
diff --git a/debian/libgazebo-ros-control0d.install b/debian/libgazebo-ros-control0d.install
deleted file mode 100644
index ea9d8af..0000000
--- a/debian/libgazebo-ros-control0d.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libgazebo_ros_control.so.*
-usr/lib/*/libdefault_robot_hw_sim.so
-usr/share/gazebo_ros_control/robot_hw_sim_plugins.xml
diff --git a/debian/patches/0004-Add-Debian-specific-SONAMEs.patch b/debian/patches/0004-Add-Debian-specific-SONAMEs.patch
deleted file mode 100644
index f59336e..0000000
--- a/debian/patches/0004-Add-Debian-specific-SONAMEs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 25 Oct 2016 16:48:09 +0200
-Subject: Add Debian specific SONAMEs
-
----
- gazebo_ros_control/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gazebo_ros_control/CMakeLists.txt b/gazebo_ros_control/CMakeLists.txt
-index cf228b0..37e05b9 100644
---- a/gazebo_ros_control/CMakeLists.txt
-+++ b/gazebo_ros_control/CMakeLists.txt
-@@ -51,9 +51,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")
- ## Libraries
- add_library(${PROJECT_NAME} src/gazebo_ros_control_plugin.cpp)
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
-+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${gazebo_ros_control_VERSION} SOVERSION "0d")
- 
- add_library(default_robot_hw_sim src/default_robot_hw_sim.cpp)
- target_link_libraries(default_robot_hw_sim ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
-+set_target_properties(default_robot_hw_sim PROPERTIES VERSION ${gazebo_ros_control_VERSION} SOVERSION "0d")
- 
- ## Install
- install(TARGETS ${PROJECT_NAME} default_robot_hw_sim
diff --git a/debian/patches/series b/debian/patches/series
index d809926..db23998 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SONAMEs.patch
-0004-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