[gazebo] 01/02: Backport from upstream a patch to solve GAZEBO_MODEL_PATH bug

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository gazebo.

commit 99f894c0b9dd016d7b4d372ab9c73ae158dd7540
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Mar 25 19:13:34 2015 +0100

    Backport from upstream a patch to solve GAZEBO_MODEL_PATH bug
---
 debian/patches/0009-backport-model-path-fix.patch | 18 ++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/0009-backport-model-path-fix.patch b/debian/patches/0009-backport-model-path-fix.patch
new file mode 100644
index 0000000..b0907e1
--- /dev/null
+++ b/debian/patches/0009-backport-model-path-fix.patch
@@ -0,0 +1,18 @@
+Description: Preserve previous GAZEBO_MODEL_PATH values when sourcing setup.sh
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1430
+
+diff --git a/cmake/setup.sh.in b/cmake/setup.sh.in
+--- a/cmake/setup.sh.in
++++ b/cmake/setup.sh.in
+@@ -1,7 +1,7 @@
+ export GAZEBO_MASTER_URI=http://@GAZEBO_DEFAULT_MASTER_HOST@:@GAZEBO_DEFAULT_MASTER_PORT@
+ export GAZEBO_MODEL_DATABASE_URI=@GAZEBO_MODEL_DATABASE_URI@
+-export GAZEBO_RESOURCE_PATH=@GAZEBO_RESOURCE_PATH@
+-export GAZEBO_PLUGIN_PATH=@GAZEBO_PLUGIN_PATH@
+-export GAZEBO_MODEL_PATH=@GAZEBO_MODEL_PATH@
++export GAZEBO_RESOURCE_PATH=@GAZEBO_RESOURCE_PATH@:${GAZEBO_RESOURCE_PATH}
++export GAZEBO_PLUGIN_PATH=@GAZEBO_PLUGIN_PATH@:${GAZEBO_PLUGIN_PATH}
++export GAZEBO_MODEL_PATH=@GAZEBO_MODEL_PATH@:${GAZEBO_MODEL_PATH}
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@GAZEBO_PLUGIN_PATH@
+ export OGRE_RESOURCE_PATH=@OGRE_RESOURCE_PATH@
diff --git a/debian/patches/series b/debian/patches/series
index 093cd86..b0e0596 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-fix-problems-on-manpage.patch
 0006-remove-maiden-font.patch
 0008-arial-font-removed-in-dfsg.patch
+0009-backport-model-path-fix.patch

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