[gentoo-commits] repo/gentoo:master commit in: dev-ros/mavlink-gbp-release/files/, dev-ros/mavlink-gbp-release/

[gentoo-commits] repo/gentoo:master commit in: dev-ros/mavlink-gbp-release/files/, dev-ros/mavlink-gbp-release/

[Alexis Ballier]

commit:     fea72a4da3f7b71cdfb6fb272370678cfe7fd2ad
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:24:22 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea72a4d

dev-ros/mavlink-gbp-release: Install package.xml in standard and gentoo location.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ros/mavlink-gbp-release/files/gentoo.patch                       | 5 +++--
 ...elease-2017.2.7.ebuild => mavlink-gbp-release-2017.2.7-r1.ebuild} | 0
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-ros/mavlink-gbp-release/files/gentoo.patch b/dev-ros/mavlink-gbp-release/files/gentoo.patch
index 1fb168cd80..92f1675715 100644
--- a/dev-ros/mavlink-gbp-release/files/gentoo.patch
+++ b/dev-ros/mavlink-gbp-release/files/gentoo.patch
@@ -2,11 +2,12 @@ Index: mavlink-gbp-release-release-kinetic-mavlink/CMakeLists.txt
 ===================================================================
 --- mavlink-gbp-release-release-kinetic-mavlink.orig/CMakeLists.txt
 +++ mavlink-gbp-release-release-kinetic-mavlink/CMakeLists.txt
-@@ -170,6 +170,6 @@ install(FILES ${PROJECT_BINARY_DIR}/COPY
+@@ -172,6 +172,8 @@ install(FILES ${PROJECT_BINARY_DIR}/COPY
      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/ COMPONENT license)
  
  install(FILES ${CMAKE_SOURCE_DIR}/package.xml
--    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/ COMPONENT catkin)
 +    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ros_packages/${PROJECT_NAME}/ COMPONENT catkin)
++install(FILES ${CMAKE_SOURCE_DIR}/package.xml
+     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/ COMPONENT catkin)
  
  # vim:sw=4:ts=4:expandtab

diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
similarity index 100%
rename from dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7.ebuild
rename to dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild