Hi, On Mon, Jan 18, 2016 at 07:52:22AM +0100, Tobias Frost wrote: > Control: tags 809837 + patch > Control: tags 809837 + pending > > Dear maintainer, > > I've prepared an NMU for hp2xx (versioned as 3.4.4-10.1) and > uploaded it to DELAYED/2. Please feel free to tell me if I > should delay it longer.
I'll try to do a regular upload before that. But I don't understand why the PNG problem suddenly comes back. When you recently reported a problem with libpng, you closed the bug yourself again a day later, because the problem "fixed itself". And now the problem is back, that does not sound reproducible to me. Can you explain why the problem is real this week? > only in patch2: > unchanged: > --- hp2xx-3.4.4.orig/.pc/.quilt_patches > +++ hp2xx-3.4.4/.pc/.quilt_patches > @@ -0,0 +1 @@ > +debian/patches > only in patch2: > unchanged: > --- hp2xx-3.4.4.orig/.pc/.quilt_series > +++ hp2xx-3.4.4/.pc/.quilt_series > @@ -0,0 +1 @@ > +series > only in patch2: > unchanged: > --- hp2xx-3.4.4.orig/.pc/.version > +++ hp2xx-3.4.4/.pc/.version > @@ -0,0 +1 @@ > +2 I don't think .pc files belong into a debian patch. > only in patch2: > unchanged: > --- hp2xx-3.4.4.orig/debian/patches/007_libpng.patch > +++ hp2xx-3.4.4/debian/patches/007_libpng.patch > @@ -0,0 +1,25 @@ > +Description: Fix for libpng 1.6 new API > +Author: Tobias Frost <t...@debian.org> > +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809837 > +Last-Update: 2016-01-18 > +--- > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > +--- a/sources/png.c > ++++ b/sources/png.c > +@@ -5,6 +5,7 @@ > + #include <stdio.h> > + #include <stdlib.h> > + #include "to_png.h" > ++#include <zlib.h> This fixes a different problem, doesn't it? > + #include <png.h> > + > + #define PDNCOL 256 > +@@ -36,7 +37,7 @@ > + } > + > + /* set up error handlimg for libpng */ > +- if (setjmp(png_ptr->jmpbuf)) { > ++ if (setjmp(png_jmpbuf(png_ptr))) { > + png_destroy_write_struct(&png_ptr, &info_ptr); > + return; > + } Christian
