[ros-rospack] 03/06: 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-rospack.

commit 4cd6caf84301f15b157252904b16d0ecde7a5f5f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jun 23 17:13:36 2017 +0200

    Rebase patches
---
 debian/patches/0001-Add-Debian-specific-SOVERSION.patch           | 8 ++++----
 .../patches/0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch  | 4 ++--
 debian/patches/0003-Make-rospack-usable-without-rosdep.patch      | 6 +++---
 debian/patches/0004-Limit-search-depth-for-usr-share.patch        | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index fa5a895..2f7ae77 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 6b5bb44..392bd9f 100644
+index c45cc94..2c6fcd9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -29,6 +29,7 @@ add_library(rospack
-   src/rospack_cmdline.cpp
+@@ -30,6 +30,7 @@ add_library(rospack
    src/utils.cpp
  )
+ target_link_libraries(rospack ${TinyXML2_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 c45f271..52763bc 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
@@ -7,10 +7,10 @@ Subject: Add usr/share as default ROS_PACKAGE_PATH
  1 file changed, 3 insertions(+)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 18be326..b213566 100644
+index 5fdfdc9..3b2ea3d 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
-@@ -277,6 +277,9 @@ bool
+@@ -287,6 +287,9 @@ bool
  Rosstackage::getSearchPathFromEnv(std::vector<std::string>& sp)
  {
    char* rpp = getenv("ROS_PACKAGE_PATH");
diff --git a/debian/patches/0003-Make-rospack-usable-without-rosdep.patch b/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
index 8fc4a83..3dfea40 100644
--- a/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
+++ b/debian/patches/0003-Make-rospack-usable-without-rosdep.patch
@@ -7,10 +7,10 @@ Subject: Make rospack usable without rosdep
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index b213566..25ad345 100644
+index 3b2ea3d..ce0420b 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
-@@ -1686,10 +1686,16 @@ Rosstackage::isSysPackage(const std::string& pkgname)
+@@ -1696,10 +1696,16 @@ Rosstackage::isSysPackage(const std::string& pkgname)
      Py_DECREF(pName);
      if(!pModule)
      {
@@ -29,7 +29,7 @@ index b213566..25ad345 100644
      }
      pDict = PyModule_GetDict(pModule);
    }
-@@ -1735,7 +1741,14 @@ Rosstackage::isSysPackage(const std::string& pkgname)
+@@ -1745,7 +1751,14 @@ Rosstackage::isSysPackage(const std::string& pkgname)
        PyErr_Print();
        PyGILState_Release(gstate);
        std::string errmsg = "the rosdep view is empty: call 'sudo rosdep init' and 'rosdep update'";
diff --git a/debian/patches/0004-Limit-search-depth-for-usr-share.patch b/debian/patches/0004-Limit-search-depth-for-usr-share.patch
index 38ef4bd..3bf13b6 100644
--- a/debian/patches/0004-Limit-search-depth-for-usr-share.patch
+++ b/debian/patches/0004-Limit-search-depth-for-usr-share.patch
@@ -7,18 +7,18 @@ Subject: Limit search depth for /usr/share
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 25ad345..0662cba 100644
+index ce0420b..ece8b3f 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
 @@ -30,6 +30,7 @@
- #include "tinyxml.h"
+ #include "tinyxml2.h"
  
  #include <boost/algorithm/string.hpp>
 +#include <boost/algorithm/string/predicate.hpp>
  #include <boost/filesystem.hpp>
  #include <boost/functional/hash.hpp>
  #include <stdexcept>
-@@ -1517,7 +1518,7 @@ Rosstackage::crawlDetail(const std::string& path,
+@@ -1527,7 +1528,7 @@ Rosstackage::crawlDetail(const std::string& path,
          std::string name = dit->path().filename().string();
  #endif
          // Ignore directories starting with '.'

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