diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-10-20 14:10:09 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-10-20 14:12:19 +0200 |
| commit | 716f1f2c35aa172d293c3957a8dcbb5ea2034f50 (patch) | |
| tree | 0286585bbda60ea387115478ece8e17c2770586f /dev-ros | |
| parent | dev-ros/rviz_plugin_tutorials: remove old (diff) | |
| download | gentoo-716f1f2c35aa172d293c3957a8dcbb5ea2034f50.tar.gz gentoo-716f1f2c35aa172d293c3957a8dcbb5ea2034f50.tar.bz2 gentoo-716f1f2c35aa172d293c3957a8dcbb5ea2034f50.zip | |
dev-ros/rviz_plugin_tutorials: install ressources in /usr/share/ros_packages since they are expected here.
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/rviz_plugin_tutorials/files/install_loc.patch | 24 | ||||
| -rw-r--r-- | dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild (renamed from dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild) | 3 | ||||
| -rw-r--r-- | dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild | 3 |
3 files changed, 28 insertions, 2 deletions
diff --git a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch new file mode 100644 index 000000000000..8ebf1233956c --- /dev/null +++ b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch @@ -0,0 +1,24 @@ +Install ressources in ros_packages subdir. We force catkin to install packages +there, so move them too. + +Index: rviz_plugin_tutorials/CMakeLists.txt +=================================================================== +--- rviz_plugin_tutorials.orig/CMakeLists.txt ++++ rviz_plugin_tutorials/CMakeLists.txt +@@ -73,13 +73,13 @@ install(TARGETS + + install(FILES + plugin_description.xml +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}) + + install(DIRECTORY media/ +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/media) ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}/media) + + install(DIRECTORY icons/ +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/icons) ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}/icons) + + install(PROGRAMS scripts/send_test_msgs.py + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild index 770d6853e776..666d6023e647 100644 --- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild +++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,3 +20,4 @@ RDEPEND=" dev-qt/qtgui:4 " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/install_loc.patch" ) diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild index 770d6853e776..666d6023e647 100644 --- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild +++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,3 +20,4 @@ RDEPEND=" dev-qt/qtgui:4 " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/install_loc.patch" ) |