Bug#843243: gazebo: diff for NMU version 7.3.1+dfsg-1.1

[Gianfranco Costamagna]

control: tags -1 pending

On deferred/5

(patch attached)

G.
On Sat, 5 Nov 2016 12:11:51 +0000 (UTC) Gianfranco Costamagna <locutusofborg at debian.org> wrote:
> Package: gazebo
> Version: 7.3.1+dfsg-1
> Severity: serious
> Justification: FTBFS with ongoing boost1.62 transition
> 
> Tags: patch
> 
> Dear maintainer,
> 
> I've prepared an NMU for gazebo (versioned as 7.3.1+dfsg-1.1) and
> not uploaded it :)
> 
> it is a cherry-pick of an upstream build fix (even if I found it after uploading
> the fix in Ubuntu).
> Can you please apply and upload? this is fixing a build failure with the current
> sid package.
> 
> Regards.
> 
> The NMU needs to sed UNRELEASED/unstable and to close this bug :)
> 
> 
> G.
-------------- next part --------------
diff -Nru gazebo-7.3.1+dfsg/debian/changelog gazebo-7.3.1+dfsg/debian/changelog
--- gazebo-7.3.1+dfsg/debian/changelog	2016-09-16 00:09:49.000000000 +0200
+++ gazebo-7.3.1+dfsg/debian/changelog	2016-11-09 21:36:30.000000000 +0100
@@ -1,3 +1,11 @@
+gazebo (7.3.1+dfsg-1.1) unstable; 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: #843243).
+
+ -- 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 -Nru gazebo-7.3.1+dfsg/debian/patches/fix-boost1.62.patch gazebo-7.3.1+dfsg/debian/patches/fix-boost1.62.patch
--- gazebo-7.3.1+dfsg/debian/patches/fix-boost1.62.patch	1970-01-01 01:00:00.000000000 +0100
+++ gazebo-7.3.1+dfsg/debian/patches/fix-boost1.62.patch	2016-11-09 21:36:30.000000000 +0100
@@ -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 -Nru gazebo-7.3.1+dfsg/debian/patches/series gazebo-7.3.1+dfsg/debian/patches/series
--- gazebo-7.3.1+dfsg/debian/patches/series	2016-09-15 23:57:55.000000000 +0200
+++ gazebo-7.3.1+dfsg/debian/patches/series	2016-11-09 21:36:30.000000000 +0100
@@ -4,3 +4,4 @@
 0009-fix-gcc6-linking.patch
 0001-fix_tinyxml_constant.patch
 0004-fix-status-double-declaration.patch
+fix-boost1.62.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20161109/5cecd360/attachment.sig>