Package: dvdauthor Version: 0.7.0-1.3 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for dvdauthor (versioned as 0.7.0-1.4) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -u dvdauthor-0.7.0/debian/changelog dvdauthor-0.7.0/debian/changelog --- dvdauthor-0.7.0/debian/changelog +++ dvdauthor-0.7.0/debian/changelog @@ -1,3 +1,12 @@ +dvdauthor (0.7.0-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS in 807657.patch (Closes: #807657) + * Fix FTBFS with libpng16 -- libpng16.patch (Closes: #649971) + * Refreshing patches + + -- Tobias Frost <t...@debian.org> Thu, 07 Jan 2016 21:00:05 +0100 + dvdauthor (0.7.0-1.3) unstable; urgency=low * Non-maintainer upload. diff -u dvdauthor-0.7.0/debian/patches/dvdauthor.help.diff dvdauthor-0.7.0/debian/patches/dvdauthor.help.diff --- dvdauthor-0.7.0/debian/patches/dvdauthor.help.diff +++ dvdauthor-0.7.0/debian/patches/dvdauthor.help.diff @@ -1,9 +1,7 @@ Send help info to stdout instead of stderr (dvdauthor) -Index: dvdauthor-0.6.18/src/dvdcli.c -=================================================================== ---- dvdauthor-0.6.18.orig/src/dvdcli.c 2010-03-24 13:51:22.486996164 +0100 -+++ dvdauthor-0.6.18/src/dvdcli.c 2010-03-24 13:51:31.886981892 +0100 -@@ -278,7 +278,7 @@ +--- a/src/dvdcli.c ++++ b/src/dvdcli.c +@@ -251,7 +251,7 @@ #define LONGOPT2(x,y) y #endif diff -u dvdauthor-0.7.0/debian/patches/series dvdauthor-0.7.0/debian/patches/series --- dvdauthor-0.7.0/debian/patches/series +++ dvdauthor-0.7.0/debian/patches/series @@ -4,0 +5,2 @@ +807657.patch +libpng16.patch only in patch2: unchanged: --- dvdauthor-0.7.0.orig/debian/patches/807657.patch +++ dvdauthor-0.7.0/debian/patches/807657.patch @@ -0,0 +1,25 @@ +Description: Fix for #807657 -- missing include "config.h" +Author: Tobias Frost <t...@frost.de> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807657 +Last-Update: 2016-01-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/compat.h ++++ b/src/compat.h +@@ -1,6 +1,8 @@ + // basic headers + #define _GNU_SOURCE /* really just for strndup */ + ++#include "config.h" ++ + #ifdef HAVE_STDBOOL_H + # include <stdbool.h> + #else +@@ -17,6 +19,7 @@ + # define __bool_true_false_are_defined 1 + #endif + ++ + #include <stdio.h> + + #ifdef HAVE_STDLIB_H only in patch2: unchanged: --- dvdauthor-0.7.0.orig/debian/patches/libpng16.patch +++ dvdauthor-0.7.0/debian/patches/libpng16.patch @@ -0,0 +1,27 @@ +Description: Fix for libpng1.6 transition + The new API hides internal structs, getters/setters are to be used. + Here: png_setjmp() +Author: Tobias Frost <t...@debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649971 +Last-Update: 2016-01-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/spuunmux.c ++++ b/src/spuunmux.c +@@ -38,6 +38,7 @@ + + #include <netinet/in.h> + ++#include <zlib.h> + #include <png.h> + + #include "rgb.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp);
