diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-11-28 15:32:24 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-11-28 16:04:28 +0100 |
| commit | b12c2eefa7918914d610e06154fb399f02e9a743 (patch) | |
| tree | bad69268cdf71bde5faf1ccde095b2851a180c0d /dev-ros | |
| parent | dev-ros/rviz: stop patching now that rospack returns proper package path (diff) | |
| download | gentoo-b12c2eefa7918914d610e06154fb399f02e9a743.tar.gz gentoo-b12c2eefa7918914d610e06154fb399f02e9a743.tar.bz2 gentoo-b12c2eefa7918914d610e06154fb399f02e9a743.zip | |
dev-ros/rviz_plugin_tutorials: drop install path patch now that rospack returns a correct one.
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-r2.ebuild (renamed from dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild) | 1 | ||||
| -rw-r--r-- | dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild | 1 |
3 files changed, 0 insertions, 26 deletions
diff --git a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch deleted file mode 100644 index 8ebf1233956c..000000000000 --- a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-r1.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild index 666d6023e647..5c64654ad3a3 100644 --- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild +++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild @@ -20,4 +20,3 @@ 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 666d6023e647..5c64654ad3a3 100644 --- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild +++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild @@ -20,4 +20,3 @@ RDEPEND=" dev-qt/qtgui:4 " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/install_loc.patch" ) |