diff -Nru gnash-0.8.11~git20160109/debian/changelog gnash-0.8.11~git20160109/debian/changelog --- gnash-0.8.11~git20160109/debian/changelog 2016-04-05 12:24:04.000000000 +0000 +++ gnash-0.8.11~git20160109/debian/changelog 2016-05-01 23:17:18.000000000 +0000 @@ -1,3 +1,22 @@ +gnash (0.8.11~git20160109-1ubuntu2) yakkety; urgency=medium + + * Rebuild for ffmpeg 3.0. + + -- Colin Watson Mon, 02 May 2016 00:17:18 +0100 + +gnash (0.8.11~git20160109-1ubuntu1) yakkety; urgency=medium + + * debian/patches/fix-boost-1.60.patch: + - fix build failure with upstream patch for boost 1.60 + + -- Gianfranco Costamagna Fri, 29 Apr 2016 16:07:45 +0200 + +gnash (0.8.11~git20160109-1build2) yakkety; urgency=medium + + * No-change rebuild for boost soname change. + + -- Matthias Klose Sat, 23 Apr 2016 18:39:17 +0000 + gnash (0.8.11~git20160109-1build1) xenial; urgency=medium * Rebuild against libmysqlclient20. diff -Nru gnash-0.8.11~git20160109/debian/patches/fix-boost-1.60.patch gnash-0.8.11~git20160109/debian/patches/fix-boost-1.60.patch --- gnash-0.8.11~git20160109/debian/patches/fix-boost-1.60.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnash-0.8.11~git20160109/debian/patches/fix-boost-1.60.patch 2016-04-29 14:23:45.000000000 +0000 @@ -0,0 +1,29 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +Origin: http://savannah.gnu.org/bugs/?46148 + +diff --git i/libbase/accumulator.h w/libbase/accumulator.h +index 694cbd2..876c669 100644 +--- i/libbase/accumulator.h ++++ w/libbase/accumulator.h +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -61,6 +62,11 @@ public: + virtual unsigned min_tokens() const { return 0; } + virtual unsigned max_tokens() const { return 0; } + ++#if BOOST_VERSION >= 105900 ++ /// There are no tokens, so this is indifferent. ++ virtual bool adjacent_tokens_only() const { return false; } ++#endif ++ + /// Accumulating from different sources is silly. + virtual bool is_composing() const { return false; } + diff -Nru gnash-0.8.11~git20160109/debian/patches/series gnash-0.8.11~git20160109/debian/patches/series --- gnash-0.8.11~git20160109/debian/patches/series 2016-01-09 14:25:28.000000000 +0000 +++ gnash-0.8.11~git20160109/debian/patches/series 2016-04-29 14:23:45.000000000 +0000 @@ -1,2 +1,3 @@ 00sensible 01ffmpeg_2.9.patch +fix-boost-1.60.patch