[ros-robot-model] 01/02: Rework plugin handling based on new pluginlib patch

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-robot-model.

commit 54e0e3896fb9af8797aacea4b76c37855395b5af
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 4 09:12:23 2015 +0100

    Rework plugin handling based on new pluginlib patch
---
 debian/control                                       | 15 +--------------
 debian/libcollada-parser-plugin.install              |  2 --
 debian/liburdf0d.install                             |  2 ++
 ...AKE_LIBRARY_ARCHITECTURE-to-find-the-plugin.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index cc93635..19338a2 100644
--- a/debian/control
+++ b/debian/control
@@ -37,19 +37,6 @@ Description: ROS collada_parser library
  .
  This package contains the library.
 
-Package: libcollada-parser-plugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Description: ROS collada_parser_plugin library
- This package contains a C++ parser for the Collada robot description format.
- The parser reads a Collada XML robot description, and creates a C++ URDF
- model. Although it is possible to directly use this parser when working with
- Collada robot descriptions, the preferred user API is found in the urdf
- package.
- .
- This package contains a plugin for the library.
-
 Package: libcollada-urdf-dev
 Section: libdevel
 Architecture: any
@@ -122,7 +109,7 @@ Description: Development files for ROS urdf library
 
 Package: liburdf0d
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcollada-parser-plugin
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
 Description: ROS urdf library
  This package contains a C++ parser for the Unified Robot Description Format
diff --git a/debian/libcollada-parser-plugin.install b/debian/libcollada-parser-plugin.install
deleted file mode 100644
index 8f3c15a..0000000
--- a/debian/libcollada-parser-plugin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libcollada_parser_plugin.so
-usr/share/collada_parser/collada_parser_plugin_description.xml
diff --git a/debian/liburdf0d.install b/debian/liburdf0d.install
index 44d408c..cdc9d34 100644
--- a/debian/liburdf0d.install
+++ b/debian/liburdf0d.install
@@ -1 +1,3 @@
 usr/lib/*/liburdf.so.*
+usr/lib/*/libcollada_parser_plugin.so
+usr/share/collada_parser/collada_parser_plugin_description.xml
diff --git a/debian/patches/0003-Define-CMAKE_LIBRARY_ARCHITECTURE-to-find-the-plugin.patch b/debian/patches/0003-Define-CMAKE_LIBRARY_ARCHITECTURE-to-find-the-plugin.patch
new file mode 100644
index 0000000..4591cc1
--- /dev/null
+++ b/debian/patches/0003-Define-CMAKE_LIBRARY_ARCHITECTURE-to-find-the-plugin.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 4 Dec 2015 09:07:23 +0100
+Subject: Define CMAKE_LIBRARY_ARCHITECTURE to find the plugin
+
+---
+ urdf/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
+index 1a5c582..f463cab 100644
+--- a/urdf/CMakeLists.txt
++++ b/urdf/CMakeLists.txt
+@@ -32,6 +32,7 @@ include_directories(
+   )
+ link_directories(${catkin_LIBRARY_DIRS})
+ 
++add_definitions(-DCMAKE_LIBRARY_ARCHITECTURE=\"${CMAKE_LIBRARY_ARCHITECTURE}\")
+ add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
+ target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${urdf_VERSION} SOVERSION "0d")
diff --git a/debian/patches/series b/debian/patches/series
index c0916ef..56e99e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
+0003-Define-CMAKE_LIBRARY_ARCHITECTURE-to-find-the-plugin.patch

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