[gazebo] 04/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 799e4c3edf7f6a96ea207d05ccca55b78f9d2d8e
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Jan 17 00:22:03 2017 +0000

    Remove merged patch
---
 .../patches/0004-fix-status-double-declaration.patch | 20 --------------------
 debian/patches/series                                |  1 -
 2 files changed, 21 deletions(-)

diff --git a/debian/patches/0004-fix-status-double-declaration.patch b/debian/patches/0004-fix-status-double-declaration.patch
deleted file mode 100644
index f63cf70..0000000
--- a/debian/patches/0004-fix-status-double-declaration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use new tinyxml constant
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-requests/2435
-Last-Update: 2016-08-31
-
-diff --git a/gazebo/gui/SpaceNav.cc b/gazebo/gui/SpaceNav.cc
-index e0d9ed2..745288d 100644
---- a/gazebo/gui/SpaceNav.cc
-+++ b/gazebo/gui/SpaceNav.cc
-@@ -25,6 +25,10 @@
- #include <gazebo/gazebo_config.h>
- #ifdef HAVE_SPNAV
- #include <spnav.h>
-+// Status is defined in X11/Xlib.h which is included by spnav.h
-+// protobuf define a class named Status. To avoid conflicts, remove here
-+// the definition of Status.
-+#undef Status
- #endif
- 
- #include "gazebo/gui/GuiIface.hh"
diff --git a/debian/patches/series b/debian/patches/series
index 8cd5af8..b3ae58d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0002_use_system_gtest.patch
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.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