Control: tags -1 pending

Hi,

On Wed, 24 Jan 2018 22:26:50 +0000 jcowg...@debian.org wrote:
> Source: ffmpegthumbnailer
> Version: 2.1.1-0.1
> Severity: important
> User: debian-multime...@lists.debian.org
> Usertags: ffmpeg-3.5-transition
> 
> Hi,
> 
> Your package FTBFS with the upcoming version 3.5 of FFmpeg.

I've uploaded the attached NMU to DELAYED/10 which fixes these two bugs
(FFmpeg 4.0 FTBFS and updating the uploaders list). Please tell me if I
should cancel it.

James
diff -Nru ffmpegthumbnailer-2.1.1/debian/changelog 
ffmpegthumbnailer-2.1.1/debian/changelog
--- ffmpegthumbnailer-2.1.1/debian/changelog    2016-03-14 19:48:01.000000000 
+0000
+++ ffmpegthumbnailer-2.1.1/debian/changelog    2018-05-25 16:39:10.000000000 
+0100
@@ -1,3 +1,13 @@
+ffmpegthumbnailer (2.1.1-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control:
+    - Remove Soeren Sonnenburg from the list of uploaders. (Closes: #881840)
+  * debian/patches:
+    - Add patch to fix FTBFS with FFmpeg 4.0. (Closes: #888346)
+
+ -- James Cowgill <jcowg...@debian.org>  Fri, 25 May 2018 16:39:10 +0100
+
 ffmpegthumbnailer (2.1.1-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru ffmpegthumbnailer-2.1.1/debian/control 
ffmpegthumbnailer-2.1.1/debian/control
--- ffmpegthumbnailer-2.1.1/debian/control      2016-03-14 19:41:53.000000000 
+0000
+++ ffmpegthumbnailer-2.1.1/debian/control      2018-05-25 16:39:07.000000000 
+0100
@@ -2,7 +2,6 @@
 Section: video
 Priority: optional
 Maintainer: Lionel Le Folgoc <mrpo...@gmail.com>
-Uploaders: Soeren Sonnenburg <so...@debian.org>
 Build-Depends: debhelper (>= 9), pkg-config, libavutil-dev, libavformat-dev,
  libavcodec-dev (>= 4:0.6~svn20100505-1~), libavfilter-dev, libpng-dev,
  libjpeg-dev, dpkg-dev (>= 1.16.1), cmake
diff -Nru ffmpegthumbnailer-2.1.1/debian/patches/ffmpeg4.patch 
ffmpegthumbnailer-2.1.1/debian/patches/ffmpeg4.patch
--- ffmpegthumbnailer-2.1.1/debian/patches/ffmpeg4.patch        1970-01-01 
01:00:00.000000000 +0100
+++ ffmpegthumbnailer-2.1.1/debian/patches/ffmpeg4.patch        2018-05-25 
16:36:57.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Author: James Cowgill <jcowg...@debian.org>
+Bug-Debian: https://bugs.debian.org/888346
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libffmpegthumbnailer/moviedecoder.cpp
++++ b/libffmpegthumbnailer/moviedecoder.cpp
+@@ -30,7 +30,6 @@ extern "C" {
+ #include <libavutil/opt.h>
+ #include <libavutil/imgutils.h>
+ #include <libavfilter/avfilter.h>
+-#include <libavfilter/avfiltergraph.h>
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ }
diff -Nru ffmpegthumbnailer-2.1.1/debian/patches/series 
ffmpegthumbnailer-2.1.1/debian/patches/series
--- ffmpegthumbnailer-2.1.1/debian/patches/series       2016-03-14 
19:42:06.000000000 +0000
+++ ffmpegthumbnailer-2.1.1/debian/patches/series       2018-05-25 
16:35:31.000000000 +0100
@@ -1 +1,2 @@
 Restored-deinterlace.patch
+ffmpeg4.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to