[ros-rviz] 01/01: Fix installation of libdefault_plugin

[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-rviz.

commit 746406e2de300c5ddb58c852ae4fa26b36603703
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 30 14:11:31 2015 +0100

    Fix installation of libdefault_plugin
---
 debian/librviz-dev.install                             |  2 +-
 debian/librviz0d.install                               |  2 +-
 .../patches/0001-Add-Debian-specific-SOVERSION.patch   | 17 ++---------------
 .../patches/0002-Fix-path-of-libdefault_plugin.patch   | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 debian/rviz.install                                    |  1 +
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/debian/librviz-dev.install b/debian/librviz-dev.install
index 5426a07..ee1dc05 100644
--- a/debian/librviz-dev.install
+++ b/debian/librviz-dev.install
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/*/lib*.so
+/usr/lib/*/librviz.so
 usr/lib/*/pkgconfig
 usr/share/rviz/cmake
diff --git a/debian/librviz0d.install b/debian/librviz0d.install
index 3ddde58..97357db 100644
--- a/debian/librviz0d.install
+++ b/debian/librviz0d.install
@@ -1 +1 @@
-usr/lib/*/lib*.so.*
+/usr/lib/*/librviz.so.*
diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index 63b1155..a219482 100644
--- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
@@ -3,9 +3,8 @@ Date: Wed, 5 Aug 2015 14:05:24 +0200
 Subject: Add Debian specific SOVERSION
 
 ---
- src/rviz/CMakeLists.txt                | 1 +
- src/rviz/default_plugin/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
+ src/rviz/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/src/rviz/CMakeLists.txt b/src/rviz/CMakeLists.txt
 index 5dad564..40a87cd 100644
@@ -19,15 +18,3 @@ index 5dad564..40a87cd 100644
  
  if(APPLE)
    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-diff --git a/src/rviz/default_plugin/CMakeLists.txt b/src/rviz/default_plugin/CMakeLists.txt
-index 8e8a3ad..c794890 100644
---- a/src/rviz/default_plugin/CMakeLists.txt
-+++ b/src/rviz/default_plugin/CMakeLists.txt
-@@ -110,6 +110,7 @@ set(SOURCE_FILES
- 
- add_library(default_plugin ${SOURCE_FILES})
- target_link_libraries(default_plugin ${PROJECT_NAME} ${catkin_LIBRARIES} ${QT_LIBRARIES} ${OGRE_OV_LIBRARIES_ABS} ${Boost_LIBRARIES})
-+set_target_properties(default_plugin PROPERTIES VERSION ${rviz_VERSION} SOVERSION "0d")
- 
- install(TARGETS default_plugin
-   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
diff --git a/debian/patches/0002-Fix-path-of-libdefault_plugin.patch b/debian/patches/0002-Fix-path-of-libdefault_plugin.patch
new file mode 100644
index 0000000..be7f8a2
--- /dev/null
+++ b/debian/patches/0002-Fix-path-of-libdefault_plugin.patch
@@ -0,0 +1,18 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Mon, 30 Nov 2015 14:04:23 +0100
+Subject: Fix path of libdefault_plugin
+
+---
+ plugin_description.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugin_description.xml b/plugin_description.xml
+index 129fbf3..ef5f3a2 100644
+--- a/plugin_description.xml
++++ b/plugin_description.xml
+@@ -1,4 +1,4 @@
+-<library path="libdefault_plugin">
++<library path="rviz/libdefault_plugin">
+   <class name="rviz/Axes" type="rviz::AxesDisplay" base_class_type="rviz::Display">
+     <description>
+       Displays an axis at the Target Frame's origin.  <a href="http://www.ros.org/wiki/rviz/DisplayTypes/Axes">More Information</a>.
diff --git a/debian/patches/series b/debian/patches/series
index 6eac731..f49b5c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-Debian-specific-SOVERSION.patch
+0002-Fix-path-of-libdefault_plugin.patch
diff --git a/debian/rviz.install b/debian/rviz.install
index 818621d..a6f1900 100644
--- a/debian/rviz.install
+++ b/debian/rviz.install
@@ -4,4 +4,5 @@ usr/share/rviz/images
 usr/share/rviz/ogre_media
 usr/share/rviz/default.rviz
 usr/share/rviz/plugin_description.xml
+usr/lib/*/libdefault_plugin.so usr/lib/rviz
 usr/share/rviz/package.xml

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