[ros-gazebo-ros-pkgs] 03/04: Remove Soname from plugins

[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 cd603760570db5e2498f8409112cee5c1bc1d811
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jul 26 10:41:04 2016 +0200

    Remove Soname from plugins
---
 debian/control                                     |  4 ++--
 debian/libgazebo-ros-dev.install                   |  3 ---
 debian/libgazebo-ros.install                       |  5 ++++
 debian/libgazebo-ros0d.install                     |  4 ----
 .../patches/0003-Add-Debian-specific-SONAMEs.patch | 27 ----------------------
 debian/patches/series                              |  1 -
 6 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index 468b002..a2eb2f4 100644
--- a/debian/control
+++ b/debian/control
@@ -65,12 +65,12 @@ Description: Python files for gazebo_plugins (Robot OS)
 Package: libgazebo-ros-dev
 Section: libdevel
 Architecture: any
-Depends: libgazebo-ros0d (= ${binary:Version}), ${misc:Depends}
+Depends: libgazebo-ros, ${misc:Depends}
 Description: development files for gazebo_ros (Robot OS)
  This package is part of Robot OS (ROS). Provides ROS plugins that offer
  message and service publishers for interfacing with Gazebo through ROS.
 
-Package: libgazebo-ros0d
+Package: libgazebo-ros
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: runtime files for gazebo_ros (Robot OS)
diff --git a/debian/libgazebo-ros-dev.install b/debian/libgazebo-ros-dev.install
index 6327265..f1fcf84 100644
--- a/debian/libgazebo-ros-dev.install
+++ b/debian/libgazebo-ros-dev.install
@@ -1,6 +1,3 @@
 usr/include/gazebo_ros
-usr/lib/*/libgazebo_ros_api_plugin.so
-usr/lib/*/libgazebo_ros_paths_plugin.so
 usr/lib/*/pkgconfig/gazebo_ros.pc
 usr/share/gazebo_ros/cmake
-usr/share/gazebo_ros/package.xml
diff --git a/debian/libgazebo-ros.install b/debian/libgazebo-ros.install
new file mode 100644
index 0000000..2fd4d5e
--- /dev/null
+++ b/debian/libgazebo-ros.install
@@ -0,0 +1,5 @@
+usr/lib/*/libgazebo_ros_api_plugin.so usr/lib
+usr/lib/*/libgazebo_ros_paths_plugin.so usr/lib
+usr/lib/gazebo_ros
+usr/share/gazebo_ros/launch
+usr/share/gazebo_ros/package.xml
diff --git a/debian/libgazebo-ros0d.install b/debian/libgazebo-ros0d.install
deleted file mode 100644
index 3a7d17f..0000000
--- a/debian/libgazebo-ros0d.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libgazebo_ros_api_plugin.so.*
-usr/lib/*/libgazebo_ros_paths_plugin.so.*
-usr/lib/gazebo_ros
-usr/share/gazebo_ros/launch
diff --git a/debian/patches/0003-Add-Debian-specific-SONAMEs.patch b/debian/patches/0003-Add-Debian-specific-SONAMEs.patch
deleted file mode 100644
index f747c19..0000000
--- a/debian/patches/0003-Add-Debian-specific-SONAMEs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 25 Oct 2016 16:46:07 +0200
-Subject: Add Debian specific SONAMEs
-
----
- gazebo_ros/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gazebo_ros/CMakeLists.txt b/gazebo_ros/CMakeLists.txt
-index 66a59c7..cf6947c 100644
---- a/gazebo_ros/CMakeLists.txt
-+++ b/gazebo_ros/CMakeLists.txt
-@@ -83,12 +83,14 @@ add_dependencies(gazebo_ros_api_plugin ${${PROJECT_NAME}_EXPORTED_TARGETS} ${cat
- set_target_properties(gazebo_ros_api_plugin PROPERTIES LINK_FLAGS "${ld_flags}")
- set_target_properties(gazebo_ros_api_plugin PROPERTIES COMPILE_FLAGS "${cxx_flags}")
- target_link_libraries(gazebo_ros_api_plugin ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${TinyXML_LIBRARIES})
-+set_target_properties(gazebo_ros_api_plugin PROPERTIES VERSION ${gazebo_ros_VERSION} SOVERSION "0d")
- 
- add_library(gazebo_ros_paths_plugin src/gazebo_ros_paths_plugin.cpp)
- add_dependencies(gazebo_ros_paths_plugin ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
- set_target_properties(gazebo_ros_paths_plugin PROPERTIES COMPILE_FLAGS "${cxx_flags}")
- set_target_properties(gazebo_ros_paths_plugin PROPERTIES LINK_FLAGS "${ld_flags}")
- target_link_libraries(gazebo_ros_paths_plugin ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_paths_plugin PROPERTIES VERSION ${gazebo_ros_VERSION} SOVERSION "0d")
- 
- # Install Gazebo System Plugins
- install(TARGETS gazebo_ros_api_plugin gazebo_ros_paths_plugin
diff --git a/debian/patches/series b/debian/patches/series
index 0c516ba..a3b168e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SONAMEs.patch
-0003-Add-Debian-specific-SONAMEs.patch
 0004-Add-Debian-specific-SONAMEs.patch
 0005-Change-boost-shared_ptr-to-urdf-JointConstSharedPtr.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-gazebo-ros-pkgs.git