[ros-catkin] 01/02: Add patch to not generate env files in /usr

Jochen Sprickerhof jspricke at moszumanska.debian.org
Mon Dec 26 12:54:09 UTC 2016


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

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

commit 93169e8bd7e37954990fa01dd4a854397c176d09
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Dec 26 13:30:03 2016 +0100

    Add patch to not generate env files in /usr
---
 debian/patches/0009-Don-t-generate-env-files.patch | 20 ++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0009-Don-t-generate-env-files.patch b/debian/patches/0009-Don-t-generate-env-files.patch
new file mode 100644
index 0000000..0fb012c
--- /dev/null
+++ b/debian/patches/0009-Don-t-generate-env-files.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Mon, 26 Dec 2016 13:27:16 +0100
+Subject: Don't generate env files
+
+---
+ cmake/all.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/all.cmake b/cmake/all.cmake
+index ce1918f..623629c 100644
+--- a/cmake/all.cmake
++++ b/cmake/all.cmake
+@@ -164,6 +164,7 @@ set(CATKIN_GLOBAL_LIB_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}")
++set(CATKIN_BUILD_BINARY_PACKAGE TRUE)
+ else()
+ set(CATKIN_GLOBAL_BIN_DESTINATION bin)
+ set(CATKIN_GLOBAL_ETC_DESTINATION etc)
diff --git a/debian/patches/series b/debian/patches/series
index 72c3f5b..38dfcd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-use-GNUInstallDirs-when-installing-into-usr.patch
 0007-Don-t-export-development-path-to-release-package.patch
 0008-Add-targets-for-gtest-libraries-locally.patch
+0009-Don-t-generate-env-files.patch

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



More information about the debian-science-commits mailing list