This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository h5utils.
commit 22b2c292487cfa30d98e9f1569b4122bcc5f1e46 Author: Bas Couwenberg <[email protected]> Date: Tue Mar 20 07:57:30 2018 +0100 Drop patches, applied upstream. --- debian/changelog | 1 + debian/patches/manpage-has-errors-from-man.patch | 82 ------------------------ debian/patches/more-h5utils-mans.patch | 39 ----------- debian/patches/series | 3 - 4 files changed, 1 insertion(+), 124 deletions(-) diff --git a/debian/changelog b/debian/changelog index 87d01df..10eb7b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ h5utils (1.13.1-1) UNRELEASED; urgency=medium * Update copyright-format URL to use HTTPS. * Add lintian override for vcs-deprecated-in-debian-infrastructure. * Update copyright years for Massachusetts Institute of Technology. + * Drop patches, applied upstream. -- Bas Couwenberg <[email protected]> Tue, 20 Mar 2018 07:54:55 +0100 diff --git a/debian/patches/manpage-has-errors-from-man.patch b/debian/patches/manpage-has-errors-from-man.patch deleted file mode 100644 index 619d26b..0000000 --- a/debian/patches/manpage-has-errors-from-man.patch +++ /dev/null @@ -1,82 +0,0 @@ -Description: Fix man page warnings: macro `"' not defined -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/stevengj/h5utils/pull/2 -Applied-Upstream: https://github.com/stevengj/h5utils/commit/c7c877e68b28686c59ff09e3b9d01dd41bf1ef2b - ---- 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 - .PP --." Add any additional description here -+.\" Add any additional description here - 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/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 - .PP --." Add any additional description here -+.\" Add any additional description here - h5fromtxt takes a series of numbers from standard input and outputs a - multi-dimensional numeric dataset in an HDF5 file. - ---- 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 - .PP --." Add any additional description here -+.\" Add any additional description here - h5math takes any number of HDF5 files as input, along with a mathematical - expression, and combines them to produce a new HDF5 file. - ---- 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 - .PP --." Add any additional description here -+.\" Add any additional description here - 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/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 - .PP --." Add any additional description here -+.\" Add any additional description here - 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/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 - .PP --." Add any additional description here -+.\" Add any additional description here - 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/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 - .PP --." Add any additional description here -+.\" Add any additional description here - h5topng is a utility to generate images in PNG (Portable Network Graphics) - format from two-dimensional slices of datasets in HDF5 files. It is - designed for quick-and-dirty visualization of scientific data, and for diff --git a/debian/patches/more-h5utils-mans.patch b/debian/patches/more-h5utils-mans.patch deleted file mode 100644 index 5b3b9d1..0000000 --- a/debian/patches/more-h5utils-mans.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Fix build with optional manpages. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/stevengj/h5utils/pull/3 -Applied-Upstream: https://github.com/stevengj/h5utils/commit/f981dd228ab65baa08491be413667a51805c992d - ---- a/configure.ac -+++ b/configure.ac -@@ -68,7 +68,7 @@ AC_CHECK_LIB(matheval, evaluator_get_var - - if test $H5MATH = yes; then - MORE_H5UTILS="h5math\$(EXEEXT) $MORE_H5UTILS" -- MORE_H5UTILS_MANS="h5math.1 $MORE_H5UTILS_MANS" -+ MORE_H5UTILS_MANS="doc/man/h5math.1 $MORE_H5UTILS_MANS" - else - AC_MSG_WARN([can't find libmatheval: won't be able to compile h5math]) - fi -@@ -102,11 +102,11 @@ if test "x$H4TOH5" != xh4toh5 -o "x$H5TO - if test $HDF4 = yes; then - if test "x$H4TOH5" != xh4toh5; then - MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" -- MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS" -+ MORE_H5UTILS_MANS="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS" - fi - if test "x$H5TOH4" != xh5toh4; then - MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" -- # MORE_H5UTILS_MANS="h4fromh5.1 $MORE_H5UTILS_MANS" -+ # MORE_H5UTILS_MANS="doc/man/h4fromh5.1 $MORE_H5UTILS_MANS" - fi - fi - fi -@@ -187,7 +187,7 @@ elif test "$ok" != "no"; then - fi - if test $H5TOV5D = yes; then - MORE_H5UTILS="h5tov5d\$(EXEEXT) $MORE_H5UTILS" -- MORE_H5UTILS_MANS="h5tov5d.1 $MORE_H5UTILS_MANS" -+ MORE_H5UTILS_MANS="doc/man/h5tov5d.1 $MORE_H5UTILS_MANS" - fi - AC_SUBST(V5D_FILES) - AC_SUBST(V5D_INCLUDES) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 90306fe..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -# no patch -manpage-has-errors-from-man.patch -more-h5utils-mans.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
