[ros-ros] 03/07: 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 dca4352b5520ce884e4fa4ce0506076e97128ccb
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jun 23 17:18:36 2017 +0200

    Rebase patches
---
 debian/patches/0002-Add-Debian-specific-SOVERSION.patch | 4 ++--
 debian/patches/0005-Fix-location-of-etc-ros-dir.patch   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index cbb726f..549b083 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -7,10 +7,10 @@ Subject: Add Debian specific SOVERSION
  1 file changed, 1 insertion(+)
 
 diff --git a/core/roslib/CMakeLists.txt b/core/roslib/CMakeLists.txt
-index 3d94910..84455b5 100644
+index 9ddf030..fe40a9a 100644
 --- a/core/roslib/CMakeLists.txt
 +++ b/core/roslib/CMakeLists.txt
-@@ -18,6 +18,7 @@ endif()
+@@ -19,6 +19,7 @@ endif()
  
  add_library(roslib src/package.cpp)
  target_link_libraries(roslib ${Boost_LIBRARIES} ${catkin_LIBRARIES})
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 60fab7a..19c15fb 100644
--- a/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
+++ b/debian/patches/0005-Fix-location-of-etc-ros-dir.patch
@@ -7,7 +7,7 @@ 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 04cda44..e5a60ce 100644
+index 6da36d6..2dbf791 100644
 --- a/core/roslib/env-hooks/10.ros.sh.em
 +++ b/core/roslib/env-hooks/10.ros.sh.em
 @@ -48,7 +48,7 @@ export ROS_ETC_DIR="@(CATKIN_DEVEL_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"

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