Your message dated Thu, 28 Jan 2016 14:13:55 +0100
with message-id <[email protected]>
and subject line Re: pngnq: diff for NMU version 1.0-2.1
has caused the Debian Bug report #812483,
regarding pngnq: diff for NMU version 1.0-2.1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
812483: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812483
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]>
-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 <[email protected]> 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);
+
+
--- End Message ---
--- Begin Message ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Version: 1.0-2.1
On Sun, 24 Jan 2016 12:17:56 +0100 Tobas Frost <[email protected]> wrote:
> 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 <[email protected]> -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
> <[email protected]> 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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJWqhQQAAoJEPNPCXROn13Z3ioP/0r4noU719ivLxHEXCxosyRO
Ourcff/aDJL5KfBQqS/FSm+bvFqA48tKNkz8lR2z2uF2/bve8ZNFXxK5Wq03J8Wz
V7cfwEPan8c4fQ9eEkupFOey0eqMbQT6rFhpDEuED0wYAaOJHH/zjBXwexKpqTFo
B+BZ5HGIiL3UZOrLg3yL7rVtsp5J9b2zGjZUoyXuHOkYbXsGFkK/8dO65cBhiJko
EYK5wVE29Ql9eEuV2iDVe7xJpBV6G8fjF9OOi2N27Sp2TJsQJN1eqBvMBUU6VbQY
U4jZ8BgsyFlCIedWBn0eVjjF0s4+jODuTFa4468xa7yajFQ9FXx0+fH2Fa67Nted
Q1PDwpJWkMKhOzwaa5pOXZgS2X2XLJcisMtoq0wYTuErMyMFPKc9iuu2xcQQzwSt
qec3AiyUPF6r7wPxh14IulRDmrRM4G/8peKDOS2YEsm1RZxfawnF0F45xqxs5Tpj
TxXkFuVTTFTf5vx6/lnmLkIA04IjbjPELWsVp4eIasNM3tfYN9A1c6L/HZBRX4Ax
gC1QUEj70PMJCyulq/qBYTGQ5NCmElmCMf++mVaEC45bmK6XRfgrLIQRC+Jqh6Bo
iA/79ES4jQx6DcAz2QvQ1XcoTJ//+l5W+ZojjhYgz/dxjgrGxRYLo4U4isDpZuru
4IENmRsZXzbkNEN6fqbP
=PPIC
-----END PGP SIGNATURE-----
--- End Message ---
