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

commit d9a9bb234079b4492c6426bd0c394f21d759a51d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jun 18 16:56:26 2016 +0200

    Refresh patches
---
 debian/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          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

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 bfa2cee..c45f271 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 efe6c11..1502a9e 100644
+index 18be326..b213566 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
-@@ -257,6 +257,9 @@ bool
+@@ -277,6 +277,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 d9b6836..8fc4a83 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 1502a9e..d4c8fc2 100644
+index b213566..25ad345 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
-@@ -1689,10 +1689,16 @@ Rosstackage::isSysPackage(const std::string& pkgname)
+@@ -1686,10 +1686,16 @@ Rosstackage::isSysPackage(const std::string& pkgname)
      Py_DECREF(pName);
      if(!pModule)
      {
@@ -29,7 +29,7 @@ index 1502a9e..d4c8fc2 100644
      }
      pDict = PyModule_GetDict(pModule);
    }
-@@ -1738,7 +1744,14 @@ Rosstackage::isSysPackage(const std::string& pkgname)
+@@ -1735,7 +1741,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 70da62f..38ef4bd 100644
--- a/debian/patches/0004-Limit-search-depth-for-usr-share.patch
+++ b/debian/patches/0004-Limit-search-depth-for-usr-share.patch
@@ -7,7 +7,7 @@ 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 d4c8fc2..ab3f72a 100644
+index 25ad345..0662cba 100644
 --- a/src/rospack.cpp
 +++ b/src/rospack.cpp
 @@ -30,6 +30,7 @@
@@ -18,7 +18,7 @@ index d4c8fc2..ab3f72a 100644
  #include <boost/filesystem.hpp>
  #include <boost/functional/hash.hpp>
  #include <stdexcept>
-@@ -1520,7 +1521,7 @@ Rosstackage::crawlDetail(const std::string& path,
+@@ -1517,7 +1518,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