[SCM] gazebo branch, master, updated. upstream/1.6.2-26-g456da84

[Thomas Moulard]

The following commit has been merged in the master branch:
commit c427b3d997dd0a310378eefe7b79e0df97b0dd76
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Thu Jul 11 16:56:23 2013 +0900

    Add patch

diff --git a/debian/patches/0001-Do-not-force-compilation-flags.patch b/debian/patches/0001-Do-not-force-compilation-flags.patch
index 0bf45b4..a9189b8 100644
--- a/debian/patches/0001-Do-not-force-compilation-flags.patch
+++ b/debian/patches/0001-Do-not-force-compilation-flags.patch
@@ -7,8 +7,8 @@ Let the compilation flags be specified by the user.
 Forwarded: no
 Author: Thomas Moulard <thomas.moulard at gmail.com>
 ---
- CMakeLists.txt                       |   40 +++++++++++++++++-----------------
- gazebo/rendering/skyx/CMakeLists.txt |    4 ++--
+ CMakeLists.txt                       | 40 ++++++++++++++++++------------------
+ gazebo/rendering/skyx/CMakeLists.txt |  4 ++--
  2 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/debian/patches/0002-In-cmake-setup.sh-do-not-override-already-defined-en.patch b/debian/patches/0002-In-cmake-setup.sh-do-not-override-already-defined-en.patch
index 70e4c07..7934ea8 100644
--- a/debian/patches/0002-In-cmake-setup.sh-do-not-override-already-defined-en.patch
+++ b/debian/patches/0002-In-cmake-setup.sh-do-not-override-already-defined-en.patch
@@ -6,7 +6,7 @@ Subject: In cmake/setup.sh do not override already defined environment
 Forwarded: no
 Author: Thomas Moulard <thomas.moulard at gmail.com>
 ---
- cmake/setup.sh.in |   20 +++++++++++++++-----
+ cmake/setup.sh.in | 20 +++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/cmake/setup.sh.in b/cmake/setup.sh.in
diff --git a/debian/patches/0003-Fix-compilation-with-last-protobul-version.patch b/debian/patches/0003-Fix-compilation-with-last-protobul-version.patch
new file mode 100644
index 0000000..a71a43d
--- /dev/null
+++ b/debian/patches/0003-Fix-compilation-with-last-protobul-version.patch
@@ -0,0 +1,24 @@
+From: Thomas Moulard <thomas.moulard at gmail.com>
+Date: Thu, 11 Jul 2013 16:54:44 +0900
+Subject: =?UTF-8?q?Fix=20compilation=20with=20last=20protobul=20version.?=
+ =?UTF-8?q?=0AAlready=20fixed=20upstream.?=
+
+Author: Thomas Moulard <thomas.moulard at gmail.com>
+Forwarded: no
+---
+ gazebo/physics/World.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gazebo/physics/World.hh b/gazebo/physics/World.hh
+index 8a0f4b4..209572a 100644
+--- a/gazebo/physics/World.hh
++++ b/gazebo/physics/World.hh
+@@ -466,7 +466,7 @@ namespace gazebo
+       private: EntityPtr selectedEntity;
+ 
+       /// \brief Incoming message buffer.
+-      private: std::vector<google::protobuf::Message> messages;
++      //private: std::vector<google::protobuf::Message> messages;
+ 
+       /// \brief Name of the world.
+       private: std::string name;
diff --git a/debian/patches/series b/debian/patches/series
index a072a08..942d093 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Do-not-force-compilation-flags.patch
 0002-In-cmake-setup.sh-do-not-override-already-defined-en.patch
+0003-Fix-compilation-with-last-protobul-version.patch

-- 
gazebo