Package: pngnq
Version: 1.0-2
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for pngnq (versioned as 1.0-2.1). The diff
is attached to this message.

Regards.
diff -u pngnq-1.0/debian/control pngnq-1.0/debian/control
--- pngnq-1.0/debian/control
+++ pngnq-1.0/debian/control
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Nelson A. de Oliveira <nao...@debian.org>
-Build-Depends: cdbs, debhelper (>= 7), libpng12-dev, zlib1g-dev
+Build-Depends: cdbs, debhelper (>= 7), libpng-dev, zlib1g-dev
 Standards-Version: 3.8.3
 Homepage: http://www.cybertherial.com/pngnq/pngnq.html
 
diff -u pngnq-1.0/debian/changelog pngnq-1.0/debian/changelog
--- pngnq-1.0/debian/changelog
+++ pngnq-1.0/debian/changelog
@@ -1,3 +1,12 @@
+pngnq (1.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with libpng 1.5", adding missing include to zlib.h
+    (Closes: #641889)
+  * Change B-D to libpng-dev (Closes: #662473)
+
+ -- Tobias Frost <t...@debian.org>  Sun, 24 Jan 2016 12:09:13 +0100
+
 pngnq (1.0-2) unstable; urgency=low
 
   * Fix FTBFS with binutils-gold (Closes: #556065):
only in patch2:
unchanged:
--- pngnq-1.0.orig/debian/patches/libpng16.patch
+++ pngnq-1.0/debian/patches/libpng16.patch
@@ -0,0 +1,20 @@
+--- a/src/rwpng.c
++++ b/src/rwpng.c
+@@ -32,15 +32,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include "png.h"        /* libpng header; includes zlib.h */
++#include <zlib.h>
++#include "png.h"
+ #include "rwpng.h"      /* typedefs, common macros, public prototypes */
+ 
+-/* future versions of libpng will provide this macro: */
+-/* GRR NOTUSED */
+-#ifndef png_jmpbuf
+-#  define png_jmpbuf(png_ptr)   ((png_ptr)->jmpbuf)
+-#endif
+-
+ static void rwpng_error_handler(png_structp png_ptr, png_const_charp msg);
+ 
+ 

Reply via email to