[h5utils] 19/39: Imported Debian patch 1.12.1-2

[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 fbede14379ed16d4ca14ec808cb1af6a04651acb
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue May 15 11:13:14 2012 +0200

    Imported Debian patch 1.12.1-2
---
 debian/changelog      | 12 ++++++++++++
 debian/control        |  5 +++--
 debian/patches/png1.5 | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series |  1 +
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index debc931..ccd8c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+h5utils (1.12.1-2) unstable; urgency=low
+
+  * Fixed a FTBS with libpng 1.5: patch png1.5.
+    (closes: #650488)
+  * Fixed b-d on new octave -dev package for octave transition.
+    (closes: #667063)
+  * Now depending on current hdf5 -dev package.
+  * Dropped versioned name dep for libmatheval -dev b-d.
+    (closes: #612754)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 May 2012 11:13:14 +0200
+
 h5utils (1.12.1-1) unstable; urgency=low
 
   * New upstream release with better Octave autodetection.
diff --git a/debian/control b/debian/control
index 4d9afed..2700dc9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7), libhdf5-serial-dev (>= 1.8.3), libz-dev, libpng-dev, hdf5-tools, 
- libhdf4-dev, libmatheval1-dev, octave3.2-headers, quilt
+Build-Depends: debhelper (>= 7), libhdf5-dev, libz-dev, libpng-dev, hdf5-tools, 
+ libhdf4-dev, libmatheval-dev, liboctave-dev, quilt
 Standards-Version: 3.8.4
 Homepage: http://ab-initio.mit.edu/h5utils/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/h5utils/trunk/
@@ -14,6 +14,7 @@ Package: h5utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: hdf5-tools
+Suggests: octave
 Description: HDF5 files visualization tools
  HDF5 (Hierarchical Data Format 5) is a file format for storing
  scientific data. These tools allow to convert other formats to
diff --git a/debian/patches/png1.5 b/debian/patches/png1.5
new file mode 100644
index 0000000..e432477
--- /dev/null
+++ b/debian/patches/png1.5
@@ -0,0 +1,44 @@
+--- h5utils-1.12.1.orig/writepng.c
++++ h5utils-1.12.1/writepng.c
+@@ -240,6 +240,7 @@
+      double skewsin = sin(skew), skewcos = cos(skew);
+      REAL minoverlay = 0, maxoverlay = 0;
+      png_byte mask_byte;
++	 png_colorp palette;
+ 
+      /* we must use direct color for translucent overlays */
+      if (overlay)
+@@ -309,7 +310,12 @@
+      }
+      /* Set error handling.  REQUIRED if you aren't supplying your own *
+       * error hadnling functions in the png_create_write_struct() call. */
++
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++     if (setjmp(png_jmpbuf(png_ptr))) {
++#else
+      if (setjmp(png_ptr->jmpbuf)) {
++#endif
+ 	  /* 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 @@
+ 		       PNG_INTERLACE_NONE,
+ 		       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+      else {
+-	  png_colorp palette;
+ 
+ 	  png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
+ 		       PNG_COLOR_TYPE_PALETTE,
+@@ -434,7 +439,12 @@
+      png_write_end(png_ptr, info_ptr);
+ 
+      /* if you malloced the palette, free it here */
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	png_free(png_ptr, palette);
++	palette = NULL;
++#else
+      free(info_ptr->palette);
++#endif
+ 
+      /* if you allocated any text comments, free them here */
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9cb90eb..1be32ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 # no patch
+png1.5

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