[rospack] 04/05: Refresh patches

[Jochen Sprickerhof]

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

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

commit 1c6df97e614edf09ace930325da87b8a925cd000
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 12 17:16:06 2014 +0100

    Refresh patches
---
 debian/patches/0001-Add-Debian-specific-SOVERSION.patch |  8 ++++----
 ...0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch | 17 +++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index 8c2b807..fa5a895 100644
--- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
@@ -7,14 +7,14 @@ Subject: Add Debian specific SOVERSION
  1 file changed, 1 insertion(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 85d9e3f..722773d 100644
+index 6b5bb44..392bd9f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ add_library(rospack
+@@ -29,6 +29,7 @@ add_library(rospack
+   src/rospack_cmdline.cpp
    src/utils.cpp
  )
- target_link_libraries(rospack ${tinyxml_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
 +set_target_properties(rospack PROPERTIES VERSION ${rospack_VERSION} SOVERSION "0d")
+ target_link_libraries(rospack ${TinyXML_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
  
  add_executable(rospackexe src/rospack_main.cpp)
- # Set the name, and make it a "global" executable
diff --git a/debian/patches/0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch b/debian/patches/0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch
index 9cfac55..bfa2cee 100644
--- a/debian/patches/0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch
+++ b/debian/patches/0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch
@@ -3,19 +3,20 @@ Date: Fri, 12 Dec 2014 07:48:34 +0100
 Subject: Add usr/share as default ROS_PACKAGE_PATH
 
 ---
- src/rospack.cpp | 2 ++
- 1 file changed, 2 insertions(+)
+ src/rospack.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 54f7f2a..519fd88 100644
+index efe6c11..1502a9e 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
-@@ -257,6 +257,8 @@ Rosstackage::getSearchPathFromEnv(std::vector<std::string>& sp)
-   char* rr = getenv("ROS_ROOT");
+@@ -257,6 +257,9 @@ bool
+ Rosstackage::getSearchPathFromEnv(std::vector<std::string>& sp)
+ {
    char* rpp = getenv("ROS_PACKAGE_PATH");
- 
++
 +  sp.push_back("/usr/share/");
 +
-   // ROS_ROOT is optional, and will be phased out
-   if(rr)
+   if(rpp)
    {
+     // I can't see that boost filesystem has an elegant cross platform

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