[ros-ros] 02/03: Rebase patches

[Jochen Sprickerhof]

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

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

commit 7421c4f556ba6437cfb043aaefce1399dd275f4e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Sep 18 21:39:17 2016 +0200

    Rebase patches
---
 debian/patches/0005-Fix-location-of-etc-ros-dir.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0005-Fix-location-of-etc-ros-dir.patch b/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
index 3cf477e..60fab7a 100644
--- a/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
+++ b/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
@@ -7,10 +7,10 @@ Subject: Fix location of etc/ros dir
  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 139246b..0beb13e 100644
+index 04cda44..e5a60ce 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"
+@@ -48,7 +48,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

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