[h5utils] 30/39: Refresh png1.5 patch, add DEP3 headers.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository h5utils.

commit b874ff52a84699444840563fad31e51d7e076710
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 22 00:04:29 2015 +0200

    Refresh png1.5 patch, add DEP3 headers.
---
 debian/changelog      |  1 +
 debian/patches/png1.5 | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d85b2c..952a1e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ h5utils (1.12.1-3) UNRELEASED; urgency=medium
   * Use minimal dh rules with autoreconf.
   * Override dh_install to use --list-missing.
   * Include README in docs.
+  * Refresh png1.5 patch, add DEP3 headers.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 21 Jul 2015 23:15:08 +0200
 
diff --git a/debian/patches/png1.5 b/debian/patches/png1.5
index e432477..4acff7b 100644
--- a/debian/patches/png1.5
+++ b/debian/patches/png1.5
@@ -1,14 +1,18 @@
---- h5utils-1.12.1.orig/writepng.c
-+++ h5utils-1.12.1/writepng.c
-@@ -240,6 +240,7 @@
+Description: Fix FTBFS with libpng 1.5.
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Bug-Debian: https://bugs.debian.org/650488
+
+--- a/writepng.c
++++ b/writepng.c
+@@ -240,6 +240,7 @@ void writepng(char *filename,
       double skewsin = sin(skew), skewcos = cos(skew);
       REAL minoverlay = 0, maxoverlay = 0;
       png_byte mask_byte;
-+	 png_colorp palette;
++     png_colorp palette;
  
       /* we must use direct color for translucent overlays */
       if (overlay)
-@@ -309,7 +310,12 @@
+@@ -309,7 +310,12 @@ void writepng(char *filename,
       }
       /* Set error handling.  REQUIRED if you aren't supplying your own *
        * error hadnling functions in the png_create_write_struct() call. */
@@ -21,7 +25,7 @@
  	  /* If we get here, we had a problem reading the file */
  	  fclose(fp);
  	  png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
-@@ -334,7 +340,6 @@
+@@ -334,7 +340,6 @@ void writepng(char *filename,
  		       PNG_INTERLACE_NONE,
  		       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
       else {
@@ -29,7 +33,7 @@
  
  	  png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
  		       PNG_COLOR_TYPE_PALETTE,
-@@ -434,7 +439,12 @@
+@@ -434,7 +439,12 @@ void writepng(char *filename,
       png_write_end(png_ptr, info_ptr);
  
       /* if you malloced the palette, free it here */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/h5utils.git