[gazebo] 03/05: Remove merged patch

[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 2462879715886b3383b7d780769115525493f945
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Jan 17 00:21:20 2017 +0000

    Remove merged patch
---
 debian/patches/0001-fix_tinyxml_constant.patch | 27 --------------------------
 debian/patches/series                          |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/0001-fix_tinyxml_constant.patch b/debian/patches/0001-fix_tinyxml_constant.patch
deleted file mode 100644
index 698bc3b..0000000
--- a/debian/patches/0001-fix_tinyxml_constant.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 9a71c7a..8cd5af8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0002_use_system_gtest.patch
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.patch
-0001-fix_tinyxml_constant.patch
 0004-fix-status-double-declaration.patch
 fix-boost1.62.patch

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