From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz_plugin_tutorials/files/, dev-ros/rviz_plugin_tutorials/
Date: Thu, 20 Oct 2016 12:12:23 +0000 (UTC) [thread overview]
Message-ID: <1476965539.716f1f2c35aa172d293c3957a8dcbb5ea2034f50.aballier@gentoo> (raw)
commit: 716f1f2c35aa172d293c3957a8dcbb5ea2034f50
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 12:10:09 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 12:12:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716f1f2c
dev-ros/rviz_plugin_tutorials: install ressources in /usr/share/ros_packages since they are expected here.
Package-Manager: portage-2.3.2
.../rviz_plugin_tutorials/files/install_loc.patch | 24 ++++++++++++++++++++++
...uild => rviz_plugin_tutorials-0.10.1-r1.ebuild} | 3 ++-
.../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 00000000..8ebf123
--- /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
similarity index 82%
rename from dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild
rename to dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
index 770d685..666d602 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 770d685..666d602 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" )
reply other threads:[~2016-10-20 12:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476965539.716f1f2c35aa172d293c3957a8dcbb5ea2034f50.aballier@gentoo \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox