[gazebo] 01/01: Applied patch in bug #843243. Thanks to Gianfranco Costamagna.
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Thu Nov 10 01:28:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository gazebo.
commit aa88ae74c72afc857e441cca829954e9034fa01a
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Thu Nov 10 01:27:10 2016 +0000
Applied patch in bug #843243. Thanks to Gianfranco Costamagna.
---
debian/changelog | 8 ++++++++
debian/patches/fix-boost1.62.patch | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 23 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cbede4e..404f46e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gazebo (7.3.1+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * d/p/fix-boost1.62.patch: cherry-pick upstream commit to fix
+ a boost1.62 build failure due to a missing include (Closes: #-1).
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Sat, 05 Nov 2016 13:06:20 +0100
+
gazebo (7.3.1+dfsg-1) unstable; urgency=medium
* Imported Upstream version 7.3.1
diff --git a/debian/patches/fix-boost1.62.patch b/debian/patches/fix-boost1.62.patch
new file mode 100644
index 0000000..091fc39
--- /dev/null
+++ b/debian/patches/fix-boost1.62.patch
@@ -0,0 +1,14 @@
+Description: fix a build failure with boost1.62
+Author: Carlos Agüero
+Origin: https://bitbucket.org/osrf/gazebo/commits/5a7cfea81159d5287a561bc8be035f89f0dc303d
+
+--- gazebo-7.3.1+dfsg.orig/gazebo/rendering/Camera.cc
++++ gazebo-7.3.1+dfsg/gazebo/rendering/Camera.cc
+@@ -25,6 +25,7 @@
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem.hpp>
++#include <boost/format.hpp>
+ #include <sdf/sdf.hh>
+
+ #ifndef _WIN32
diff --git a/debian/patches/series b/debian/patches/series
index 0d8aa47..8823300 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0009-fix-gcc6-linking.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
More information about the debian-science-commits
mailing list