Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz_plugin_tutorials/, dev-ros/rviz_plugin_tutorials/files/
Date: Mon, 28 Nov 2016 15:11:37
Message-Id: 1480345468.b12c2eefa7918914d610e06154fb399f02e9a743.aballier@gentoo
1 commit: b12c2eefa7918914d610e06154fb399f02e9a743
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 28 14:32:24 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 28 15:04:28 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12c2eef
7
8 dev-ros/rviz_plugin_tutorials: drop install path patch now that rospack returns a correct one.
9
10 Package-Manager: portage-2.3.2
11
12 .../rviz_plugin_tutorials/files/install_loc.patch | 24 ----------------------
13 ...uild => rviz_plugin_tutorials-0.10.1-r2.ebuild} | 1 -
14 .../rviz_plugin_tutorials-9999.ebuild | 1 -
15 3 files changed, 26 deletions(-)
16
17 diff --git a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch
18 deleted file mode 100644
19 index 8ebf123..00000000
20 --- a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch
21 +++ /dev/null
22 @@ -1,24 +0,0 @@
23 -Install ressources in ros_packages subdir. We force catkin to install packages
24 -there, so move them too.
25 -
26 -Index: rviz_plugin_tutorials/CMakeLists.txt
27 -===================================================================
28 ---- rviz_plugin_tutorials.orig/CMakeLists.txt
29 -+++ rviz_plugin_tutorials/CMakeLists.txt
30 -@@ -73,13 +73,13 @@ install(TARGETS
31 -
32 - install(FILES
33 - plugin_description.xml
34 -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
35 -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME})
36 -
37 - install(DIRECTORY media/
38 -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/media)
39 -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}/media)
40 -
41 - install(DIRECTORY icons/
42 -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/icons)
43 -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}/icons)
44 -
45 - install(PROGRAMS scripts/send_test_msgs.py
46 - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
47
48 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
49 similarity index 90%
50 rename from dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
51 rename to dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild
52 index 666d602..5c64654 100644
53 --- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
54 +++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild
55 @@ -20,4 +20,3 @@ RDEPEND="
56 dev-qt/qtgui:4
57 "
58 DEPEND="${RDEPEND}"
59 -PATCHES=( "${FILESDIR}/install_loc.patch" )
60
61 diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
62 index 666d602..5c64654 100644
63 --- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
64 +++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
65 @@ -20,4 +20,3 @@ RDEPEND="
66 dev-qt/qtgui:4
67 "
68 DEPEND="${RDEPEND}"
69 -PATCHES=( "${FILESDIR}/install_loc.patch" )