[ros-robot-model] 01/01: Update collada_parser plugin

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Mon Nov 30 20:29:46 UTC 2015


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 e683e11539ac6ac881774957be9eb28b288b8849
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 30 21:06:16 2015 +0100

    Update collada_parser plugin
---
 debian/control                                          | 12 ++++++++++++
 debian/libcollada-parser-dev.install                    |  3 ++-
 debian/patches/0002-Add-Debian-specific-SOVERSION.patch | 15 ++++-----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 19338a2..682a9fc 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,18 @@ Description: ROS collada_parser library
  .
  This package contains the library.
 
+Package: libcollada-parser-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
diff --git a/debian/libcollada-parser-dev.install b/debian/libcollada-parser-dev.install
index 36adbea..ba8edee 100644
--- a/debian/libcollada-parser-dev.install
+++ b/debian/libcollada-parser-dev.install
@@ -1,4 +1,5 @@
 usr/include/collada_parser
 usr/lib/*/libcollada_parser.so
 usr/lib/*/pkgconfig/collada_parser.pc
-usr/share/collada_parser
+usr/share/collada_parser/package.xml
+usr/share/collada_parser/cmake
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index a1eb6f0..ce963a0 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -3,17 +3,17 @@ Date: Wed, 5 Aug 2015 13:36:06 +0200
 Subject: Add Debian specific SOVERSION
 
 ---
- collada_parser/CMakeLists.txt | 2 ++
+ collada_parser/CMakeLists.txt | 1 +
  collada_urdf/CMakeLists.txt   | 1 +
  kdl_parser/CMakeLists.txt     | 1 +
  urdf/CMakeLists.txt           | 1 +
- 4 files changed, 5 insertions(+)
+ 4 files changed, 4 insertions(+)
 
 diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt
-index 43ed0c8..6366507 100644
+index 43ed0c8..2ff275e 100644
 --- a/collada_parser/CMakeLists.txt
 +++ b/collada_parser/CMakeLists.txt
-@@ -37,12 +37,14 @@ add_library(${PROJECT_NAME} src/collada_parser.cpp)
+@@ -37,6 +37,7 @@ add_library(${PROJECT_NAME} src/collada_parser.cpp)
  target_link_libraries(${PROJECT_NAME}
    ${COLLADA_DOM_LIBRARIES} ${Boost_LIBRARIES} ${catkin_LIBRARIES}
  )
@@ -21,13 +21,6 @@ index 43ed0c8..6366507 100644
  
  # build the plugin for the parser
  add_library(${PROJECT_NAME}_plugin src/collada_parser_plugin.cpp)
- target_link_libraries(${PROJECT_NAME}_plugin
-   ${PROJECT_NAME} ${Boost_LIBRARIES} ${catkin_LIBRARIES}
- )
-+set_target_properties(${PROJECT_NAME}_plugin PROPERTIES VERSION ${collada_parser_VERSION} SOVERSION "0d")
- 
- set_target_properties(${PROJECT_NAME}
-   PROPERTIES COMPILER_FLAGS "${COLLADA_DOM_CFLAGS_OTHER}"
 diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
 index 524f2e9..756c39c 100644
 --- a/collada_urdf/CMakeLists.txt

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



More information about the debian-science-commits mailing list