[rospack] 01/01: Add patch for default ROS_PACKAGE_PATH

[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 9e30bf262c2e66c4ba44c964569fc4839d36935e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 12 08:04:10 2014 +0100

    Add patch for default ROS_PACKAGE_PATH
---
 ...-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

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
new file mode 100644
index 0000000..9cfac55
--- /dev/null
+++ b/debian/patches/0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+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(+)
+
+diff --git a/src/rospack.cpp b/src/rospack.cpp
+index 54f7f2a..519fd88 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");
+   char* rpp = getenv("ROS_PACKAGE_PATH");
+ 
++  sp.push_back("/usr/share/");
++
+   // ROS_ROOT is optional, and will be phased out
+   if(rr)
+   {
diff --git a/debian/patches/series b/debian/patches/series
index 6eac731..898d8d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-Debian-specific-SOVERSION.patch
+0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch

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