Author: frankie Date: 2012-05-15 09:28:28 +0000 (Tue, 15 May 2012) New Revision: 3066
Added: packages/h5utils/trunk/debian/patches/png1.5 Modified: packages/h5utils/trunk/debian/changelog packages/h5utils/trunk/debian/control packages/h5utils/trunk/debian/patches/series Log: Fixed FTBS Modified: packages/h5utils/trunk/debian/changelog =================================================================== --- packages/h5utils/trunk/debian/changelog 2012-02-29 23:54:54 UTC (rev 3065) +++ packages/h5utils/trunk/debian/changelog 2012-05-15 09:28:28 UTC (rev 3066) @@ -1,3 +1,12 @@ +h5utils (1.12.1-2) unstable; urgency=low + + * Fixed a FTBS with libpng 1.5: patch png1.5. + * Fixed b-d on new octave -dev package for octave transition. + (closes: #667063) + * Now depending on current hdf5 -dev package. + + -- Francesco Paolo Lovergine <fran...@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. Modified: packages/h5utils/trunk/debian/control =================================================================== --- packages/h5utils/trunk/debian/control 2012-02-29 23:54:54 UTC (rev 3065) +++ packages/h5utils/trunk/debian/control 2012-05-15 09:28:28 UTC (rev 3066) @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@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, libmatheval1-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 @@ 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 Added: packages/h5utils/trunk/debian/patches/png1.5 =================================================================== --- packages/h5utils/trunk/debian/patches/png1.5 (rev 0) +++ packages/h5utils/trunk/debian/patches/png1.5 2012-05-15 09:28:28 UTC (rev 3066) @@ -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 */ + Modified: packages/h5utils/trunk/debian/patches/series =================================================================== --- packages/h5utils/trunk/debian/patches/series 2012-02-29 23:54:54 UTC (rev 3065) +++ packages/h5utils/trunk/debian/patches/series 2012-05-15 09:28:28 UTC (rev 3066) @@ -1 +1,2 @@ # no patch +png1.5 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel