[gazebo] 01/02: Include patch to fix tinyxml constant removal

[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 3d436284fc38a8bc068c299f3adc4467addc55d0
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 29 00:43:21 2016 +0000

    Include patch to fix tinyxml constant removal
---
 debian/patches/0001-fix_tinyxml_constant.patch | 27 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/0001-fix_tinyxml_constant.patch b/debian/patches/0001-fix_tinyxml_constant.patch
new file mode 100644
index 0000000..698bc3b
--- /dev/null
+++ b/debian/patches/0001-fix_tinyxml_constant.patch
@@ -0,0 +1,27 @@
+Description: Use new tinyxml constant
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Applied-Upstream:  https://bitbucket.org/osrf/gazebo/pull-requests/2397
+Last-Update: 2016-08-29
+
+diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc
+index b8e1f96..774774a 100644
+--- a/gazebo/util/LogPlay.cc
++++ b/gazebo/util/LogPlay.cc
+@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_logFile)
+ 
+   // Flag use to indicate if a parser failure has occurred
+   bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+-    tinyxml2::XML_NO_ERROR;
++    tinyxml2::XML_SUCCESS;
+ 
+   // Parse the log file
+   if (xmlParserFail)
+@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_logFile)
+ 
+           // Retry loading the log file.
+           xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+-            tinyxml2::XML_NO_ERROR;
++            tinyxml2::XML_SUCCESS;
+         }
+       }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 6f1d740..702cf99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.patch
 0009-fix-gcc6-linking.patch
+0001-fix_tinyxml_constant.patch

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