[ros-ros] 01/01: Add patch for ROS_ETC_DIR

[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-ros.

commit 1fbcc0c2bb8d02eb3dc7fe244ac4cf3416906fab
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 16 18:11:20 2015 +0100

    Add patch for ROS_ETC_DIR
---
 .../patches/0005-Fix-location-of-etc-ros-dir.patch  | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/0005-Fix-location-of-etc-ros-dir.patch b/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
new file mode 100644
index 0000000..095eb48
--- /dev/null
+++ b/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Mon, 16 Nov 2015 18:10:45 +0100
+Subject: Fix location of etc/ros dir
+
+---
+ core/roslib/env-hooks/10.ros.sh.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/roslib/env-hooks/10.ros.sh.em b/core/roslib/env-hooks/10.ros.sh.em
+index 7a65047..8461f6d 100644
+--- a/core/roslib/env-hooks/10.ros.sh.em
++++ b/core/roslib/env-hooks/10.ros.sh.em
+@@ -40,7 +40,7 @@ export ROS_ETC_DIR="@(CATKIN_DEVEL_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"
+ if [ -z "$CATKIN_ENV_HOOK_WORKSPACE" ]; then
+   CATKIN_ENV_HOOK_WORKSPACE="@(CMAKE_INSTALL_PREFIX)"
+ fi
+-export ROS_ETC_DIR="$CATKIN_ENV_HOOK_WORKSPACE/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"
++export ROS_ETC_DIR="/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"
+ @[end if]@
+ 
+ # unset ROS workspace
diff --git a/debian/patches/series b/debian/patches/series
index 859388e..1b0b794 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Add-Debian-specific-SOVERSION.patch
 0003-Fix-env-roscreatepkg.patch
 0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
+0005-Fix-location-of-etc-ros-dir.patch

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