[ros-gazebo-ros-pkgs] 04/04: Add patch for scripts

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-gazebo-ros-pkgs.

commit 988a3fea488dd295bd14899e9a84bfaa3016d871
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Dec 7 18:57:47 2016 +0100

    Add patch for scripts
---
 .../patches/0006-Hardcode-Gazebo-path-to-usr.patch | 74 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 75 insertions(+)

diff --git a/debian/patches/0006-Hardcode-Gazebo-path-to-usr.patch b/debian/patches/0006-Hardcode-Gazebo-path-to-usr.patch
new file mode 100644
index 0000000..f85207a
--- /dev/null
+++ b/debian/patches/0006-Hardcode-Gazebo-path-to-usr.patch
@@ -0,0 +1,74 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Wed, 7 Dec 2016 18:57:04 +0100
+Subject: Hardcode Gazebo path to /usr
+
+removed dependency on libgazebo-dev
+---
+ gazebo_ros/scripts/debug    | 2 +-
+ gazebo_ros/scripts/gazebo   | 2 +-
+ gazebo_ros/scripts/gzclient | 2 +-
+ gazebo_ros/scripts/gzserver | 2 +-
+ gazebo_ros/scripts/perf     | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gazebo_ros/scripts/debug b/gazebo_ros/scripts/debug
+index dfb11de..14cceac 100755
+--- a/gazebo_ros/scripts/debug
++++ b/gazebo_ros/scripts/debug
+@@ -22,5 +22,5 @@ then
+     final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
+ fi
+ 
+-setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
++setup_path=/usr/share/gazebo/
+ . $setup_path/setup.sh && rosrun gazebo_ros gdbrun gzserver $final
+diff --git a/gazebo_ros/scripts/gazebo b/gazebo_ros/scripts/gazebo
+index 392dac7..512208d 100755
+--- a/gazebo_ros/scripts/gazebo
++++ b/gazebo_ros/scripts/gazebo
+@@ -26,7 +26,7 @@ fi
+ 
+ client_final="-g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
+ 
+-setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
++setup_path=/usr/share/gazebo/
+ 
+ # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
+ desired_master_uri="$GAZEBO_MASTER_URI"
+diff --git a/gazebo_ros/scripts/gzclient b/gazebo_ros/scripts/gzclient
+index 0dab137..89ce53c 100755
+--- a/gazebo_ros/scripts/gzclient
++++ b/gazebo_ros/scripts/gzclient
+@@ -16,7 +16,7 @@ then
+     final="$final -g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
+ fi
+ 
+-setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
++setup_path=/usr/share/gazebo/
+ 
+ # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
+ desired_master_uri="$GAZEBO_MASTER_URI"
+diff --git a/gazebo_ros/scripts/gzserver b/gazebo_ros/scripts/gzserver
+index 883ad94..2eaee86 100755
+--- a/gazebo_ros/scripts/gzserver
++++ b/gazebo_ros/scripts/gzserver
+@@ -22,7 +22,7 @@ then
+     final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
+ fi
+ 
+-setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
++setup_path=/usr/share/gazebo/
+ 
+ # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
+ desired_master_uri="$GAZEBO_MASTER_URI"
+diff --git a/gazebo_ros/scripts/perf b/gazebo_ros/scripts/perf
+index fefb88a..9bb82e0 100755
+--- a/gazebo_ros/scripts/perf
++++ b/gazebo_ros/scripts/perf
+@@ -21,5 +21,5 @@ then
+     final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
+ fi
+ 
+-setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
++setup_path=/usr/share/gazebo/
+ . $setup_path/setup.sh && /usr/bin/valgrind --tool=callgrind gzserver $final
diff --git a/debian/patches/series b/debian/patches/series
index a3b168e..d809926 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Add-Debian-specific-SONAMEs.patch
 0004-Add-Debian-specific-SONAMEs.patch
 0005-Change-boost-shared_ptr-to-urdf-JointConstSharedPtr.patch
+0006-Hardcode-Gazebo-path-to-usr.patch

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