[ros-catkin] 01/01: Change location of libexec to lib (without triplet)

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-catkin.

commit 8fb1b5c2e828dfd980d89ba771605b5f8d2f53ae
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Feb 13 16:00:04 2016 +0100

    Change location of libexec to lib (without triplet)
---
 debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch       | 2 +-
 .../patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch b/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
index dd9c3c7..8770126 100644
--- a/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
+++ b/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
@@ -7,7 +7,7 @@ Subject: Fix location of /etc for catkin_find
  1 file changed, 2 insertions(+)
 
 diff --git a/python/catkin/find_in_workspaces.py b/python/catkin/find_in_workspaces.py
-index 4d5623e..d7e0b80 100644
+index 0c74f0a..8ef3ad6 100644
 --- a/python/catkin/find_in_workspaces.py
 +++ b/python/catkin/find_in_workspaces.py
 @@ -123,6 +123,8 @@ def find_in_workspaces(search_dirs=None, project=None, path=None, _workspaces=ge
diff --git a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
index b715bcd..2e95b48 100644
--- a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
+++ b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
@@ -2,14 +2,14 @@ From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
 Date: Thu, 19 Nov 2015 17:27:23 +0100
 Subject: use GNUInstallDirs when installing into /usr
 
-use libdir for libexec as per policy
+use lib for libexec
 ---
  cmake/all.cmake            | 12 ++++++++++++
  cmake/catkin_package.cmake |  6 +++---
  2 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/all.cmake b/cmake/all.cmake
-index 6910906..8b0ca46 100644
+index 6910906..ce1918f 100644
 --- a/cmake/all.cmake
 +++ b/cmake/all.cmake
 @@ -154,6 +154,17 @@ message(STATUS "catkin ${catkin_VERSION}")
@@ -23,7 +23,7 @@ index 6910906..8b0ca46 100644
 +set(CATKIN_GLOBAL_ETC_DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}")
 +set(CATKIN_GLOBAL_INCLUDE_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 +set(CATKIN_GLOBAL_LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+set(CATKIN_GLOBAL_LIBEXEC_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++set(CATKIN_GLOBAL_LIBEXEC_DESTINATION lib)
 +set(CATKIN_GLOBAL_PYTHON_DESTINATION ${PYTHON_INSTALL_DIR})
 +set(CATKIN_GLOBAL_SHARE_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}")
 +else()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-catkin.git