This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository h5utils.
commit 1ca476cdd75b21840bc0f446f1ce686e501450f1 Author: Bas Couwenberg <[email protected]> Date: Wed Jul 19 17:40:44 2017 +0200 Drop png1.5 patch, fixed upstream. --- debian/changelog | 1 + debian/patches/manpage-has-errors-from-man.patch | 28 +++++++------- debian/patches/png1.5 | 48 ------------------------ debian/patches/series | 1 - 4 files changed, 15 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8809ee6..ea5e8f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ h5utils (1.13-1) UNRELEASED; urgency=medium * Bump Standards-Version to 4.0.0, no changes. * Add autopkgtest to test installability. * Update copyright file. + * Drop png1.5 patch, fixed upstream. -- Bas Couwenberg <[email protected]> Wed, 19 Jul 2017 17:33:34 +0200 diff --git a/debian/patches/manpage-has-errors-from-man.patch b/debian/patches/manpage-has-errors-from-man.patch index 9b2b49a..590eae4 100644 --- a/debian/patches/manpage-has-errors-from-man.patch +++ b/debian/patches/manpage-has-errors-from-man.patch @@ -1,8 +1,8 @@ Description: Fix man page warnings: macro `"' not defined Author: Bas Couwenberg <[email protected]> ---- a/h5fromh4.1 -+++ b/h5fromh4.1 +--- a/doc/man/h5fromh4.1 ++++ b/doc/man/h5fromh4.1 @@ -27,7 +27,7 @@ h5fromh4 \- convert HDF4 scientific data [\fIOPTION\fR]... [\fIHDF4FILE\fR]... .SH DESCRIPTION @@ -12,8 +12,8 @@ Author: Bas Couwenberg <[email protected]> h5fromh4 takes one or more files in HDF4 format and outputs files in HDF5 format containing the datasets from the HDF4 files. (Currently, only a single dataset per HDF4 file is converted.) ---- a/h5fromtxt.1 -+++ b/h5fromtxt.1 +--- a/doc/man/h5fromtxt.1 ++++ b/doc/man/h5fromtxt.1 @@ -27,7 +27,7 @@ h5fromtxt \- convert text input to an HD [\fIOPTION\fR]... [\fIHDF5FILE\fR] .SH DESCRIPTION @@ -23,8 +23,8 @@ Author: Bas Couwenberg <[email protected]> h5fromtxt takes a series of numbers from standard input and outputs a multi-dimensional numeric dataset in an HDF5 file. ---- a/h5math.1 -+++ b/h5math.1 +--- a/doc/man/h5math.1 ++++ b/doc/man/h5math.1 @@ -27,7 +27,7 @@ h5math \- combine/create HDF5 files with [\fIOPTION\fR]... \fIOUTPUT-HDF5FILE\fR [\fIINPUT-HDF5FILES\fR...] .SH DESCRIPTION @@ -34,8 +34,8 @@ Author: Bas Couwenberg <[email protected]> h5math takes any number of HDF5 files as input, along with a mathematical expression, and combines them to produce a new HDF5 file. ---- a/h5totxt.1 -+++ b/h5totxt.1 +--- a/doc/man/h5totxt.1 ++++ b/doc/man/h5totxt.1 @@ -27,7 +27,7 @@ h5totxt \- generate comma-delimited text [\fIOPTION\fR]... [\fIHDF5FILE\fR]... .SH DESCRIPTION @@ -45,8 +45,8 @@ Author: Bas Couwenberg <[email protected]> h5totxt is a utility to generate comma-delimited text (and similar formats) from one-, two-, or more-dimensional slices of numeric datasets in HDF5 files. This way, the data can easily be imported ---- a/h5tov5d.1 -+++ b/h5tov5d.1 +--- a/doc/man/h5tov5d.1 ++++ b/doc/man/h5tov5d.1 @@ -27,7 +27,7 @@ h5tov5d \- convert datasets in HDF5 file [\fIOPTION\fR]... [\fIHDF5FILE\fR]... .SH DESCRIPTION @@ -56,8 +56,8 @@ Author: Bas Couwenberg <[email protected]> h5tov5d is a program to generate Vis5d data files from multidimensional datasets in HDF5 files. Vis5d is a free volumetric visualization program capable of displaying 3, 4, or even 5 ---- a/h5tovtk.1 -+++ b/h5tovtk.1 +--- a/doc/man/h5tovtk.1 ++++ b/doc/man/h5tovtk.1 @@ -27,7 +27,7 @@ h5tovtk \- convert datasets in HDF5 file [\fIOPTION\fR]... [\fIHDF5FILE\fR]... .SH DESCRIPTION @@ -67,8 +67,8 @@ Author: Bas Couwenberg <[email protected]> h5tovtk is a program to generate VTK data files from multidimensional datasets in HDF5 files. VTK, the Visualization ToolKit, is an open-source, freely available software system for 3D computer ---- a/h5topng.1.in -+++ b/h5topng.1.in +--- a/doc/man/h5topng.1.in ++++ b/doc/man/h5topng.1.in @@ -27,7 +27,7 @@ h5topng \- generate PNG images from 2d s [\fIOPTION\fR]... [\fIHDF5FILE\fR]... .SH DESCRIPTION diff --git a/debian/patches/png1.5 b/debian/patches/png1.5 deleted file mode 100644 index 4acff7b..0000000 --- a/debian/patches/png1.5 +++ /dev/null @@ -1,48 +0,0 @@ -Description: Fix FTBFS with libpng 1.5. -Author: Nobuhiro Iwamatsu <[email protected]> -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; - - /* we must use direct color for translucent overlays */ - if (overlay) -@@ -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. */ -+ -+#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 @@ void writepng(char *filename, - 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 @@ void writepng(char *filename, - 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 0bc02f3..3ffb36c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ # no patch -png1.5 manpage-has-errors-from-man.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/h5utils.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
