commit: b12c2eefa7918914d610e06154fb399f02e9a743
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 14:32:24 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 15:04:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12c2eef
dev-ros/rviz_plugin_tutorials: drop install path patch now that rospack returns
a correct one.
Package-Manager: portage-2.3.2
.../rviz_plugin_tutorials/files/install_loc.patch | 24 ----------------------
...uild => rviz_plugin_tutorials-0.10.1-r2.ebuild} | 1 -
.../rviz_plugin_tutorials-9999.ebuild | 1 -
3 files changed, 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 8ebf123..00000000
--- 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
similarity index 90%
rename from dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
rename to dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild
index 666d602..5c64654 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 666d602..5c64654 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" )
