[ros-ros] 02/02: Added /usr/lib// as search path to find executables

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ros-ros.

commit d5d3e5e7b6cdb0a565108591cd8a7f5590d2af5e
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Fri Feb 5 13:12:23 2016 +0100

    Added /usr/lib// as search path to find executables
---
 ...atch => 0003-Missing-env-in-roscreatepkg.patch} |  6 +++--
 ...Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch} |  0
 ...sr-lib-as-search-path-to-find-executables.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  5 ++--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0003-Fix-env-roscreatepkg.patch b/debian/patches/0003-Missing-env-in-roscreatepkg.patch
similarity index 72%
rename from debian/patches/0003-Fix-env-roscreatepkg.patch
rename to debian/patches/0003-Missing-env-in-roscreatepkg.patch
index 185d362..2302425 100644
--- a/debian/patches/0003-Fix-env-roscreatepkg.patch
+++ b/debian/patches/0003-Missing-env-in-roscreatepkg.patch
@@ -1,5 +1,5 @@
 From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue Feb  3 09:15:00 CET 2015
+Date: Tue, 3 Feb 2015 09:15:00 +0100
 Subject: Missing env in roscreatepkg
 
 The script has a missing 
@@ -7,10 +7,12 @@ The script has a missing
 #!/usr/bin/env python
 
 line.
-
 ---
  tools/roscreate/src/roscreate/roscreatepkg.py | 1 +
  1 file changed, 1 insertion(+)
+
+diff --git a/tools/roscreate/src/roscreate/roscreatepkg.py b/tools/roscreate/src/roscreate/roscreatepkg.py
+index 1fe5128..2fe9322 100755
 --- a/tools/roscreate/src/roscreate/roscreatepkg.py
 +++ b/tools/roscreate/src/roscreate/roscreatepkg.py
 @@ -1,3 +1,4 @@
diff --git a/debian/patches/0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch b/debian/patches/0004-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
similarity index 100%
rename from debian/patches/0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
rename to debian/patches/0004-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
diff --git a/debian/patches/0007-Added-usr-lib-as-search-path-to-find-executables.patch b/debian/patches/0007-Added-usr-lib-as-search-path-to-find-executables.patch
new file mode 100644
index 0000000..d2977bf
--- /dev/null
+++ b/debian/patches/0007-Added-usr-lib-as-search-path-to-find-executables.patch
@@ -0,0 +1,29 @@
+From: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
+Date: Fri, 5 Feb 2016 13:09:17 +0100
+Subject: Added /usr/lib// as search path to find executables
+
+---
+ tools/rosbash/scripts/rosrun | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/rosbash/scripts/rosrun b/tools/rosbash/scripts/rosrun
+index 7ec36d9..31d0551 100755
+--- a/tools/rosbash/scripts/rosrun
++++ b/tools/rosbash/scripts/rosrun
+@@ -58,6 +58,7 @@ debug "Looking in rospack dir: $pkgdir"
+ if [[ ${#catkin_package_libexec_dirs[@]} -eq 0 && -z $pkgdir ]]; then
+   exit 2
+ fi
++host_arch=`dpkg-architecture -qDEB_HOST_MULTIARCH`
+ if [[ ! $2 == */* ]]; then
+   # The -perm /mode usage is not available in find on the Mac
+   #exepathlist=(`find $pkgdir -name $2 -type f -perm /u+x,g+x,o+x`)
+@@ -68,7 +69,7 @@ if [[ ! $2 == */* ]]; then
+     _perm="/111"
+   fi
+   debug "Searching for $2 with permissions $_perm"
+-  exepathlist="`find -L "${catkin_package_libexec_dirs[@]}" "$pkgdir" -name "$2" -type f  -perm "$_perm" ! -regex ".*$pkgdir\/build\/.*" | uniq`"
++  exepathlist="`find -L "${catkin_package_libexec_dirs[@]}" "$pkgdir" "/usr/lib/$host_arch" -name "$2" -type f  -perm "$_perm" ! -regex ".*$pkgdir\/build\/.*" | uniq`"
+   IFS=$'\n'
+   exepathlist=($exepathlist)
+   unset IFS
diff --git a/debian/patches/series b/debian/patches/series
index e97aa32..5fb1cd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
-0003-Fix-env-roscreatepkg.patch
-0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
+0003-Missing-env-in-roscreatepkg.patch
+0004-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
 0005-Fix-location-of-etc-ros-dir.patch
 0006-Add-default-ROS_ROOT-to-rosmake.patch
+0007-Added-usr-lib-as-search-path-to-find-executables.patch

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