This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository hdf4.
commit ae493a442c874965996d7e74bcc85b886217388f
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun May 8 14:58:10 2016 +0200
Refresh patches.
---
debian/patches/64bit | 4 +--
debian/patches/autotools | 52 ---------------------------------
debian/patches/config | 12 +++-----
debian/patches/fmpool | 18 ++++--------
debian/patches/hdf-4.2.10-aarch64.patch | 12 +++-----
debian/patches/man | 6 ++--
debian/patches/shared_fortran | 4 ---
7 files changed, 17 insertions(+), 91 deletions(-)
diff --git a/debian/patches/64bit b/debian/patches/64bit
index 0ba8786..d8179db 100644
--- a/debian/patches/64bit
+++ b/debian/patches/64bit
@@ -1,11 +1,9 @@
Description: Additional 64bit architectures.
Author: Francesco Paolo Lovergine <fran...@debian.org>
-Index: b/mfhdf/libsrc/netcdf.h.in
-===================================================================
--- a/mfhdf/libsrc/netcdf.h.in
+++ b/mfhdf/libsrc/netcdf.h.in
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ typedef double ncdouble;
/*
* Variables/attributes of type NC_LONG should use the C type 'nclong'
*/
diff --git a/debian/patches/autotools b/debian/patches/autotools
index 9357ddc..69d2af0 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -1,8 +1,6 @@
Description: Rename libdf to libdfalt and libmfhdf to libmfhdfalt.
Author: Francesco Paolo Lovergine <fran...@debian.org>
-Index: b/HDF4/hdf/src/Makefile.am
-===================================================================
--- a/HDF4/hdf/src/Makefile.am
+++ b/HDF4/hdf/src/Makefile.am
@@ -4,7 +4,7 @@
@@ -27,8 +25,6 @@ Index: b/HDF4/hdf/src/Makefile.am
include_HEADERS = $(CHEADERS)
endif
-Index: b/HDF4/hdf/util/Makefile.am
-===================================================================
--- a/HDF4/hdf/util/Makefile.am
+++ b/HDF4/hdf/util/Makefile.am
@@ -107,8 +107,8 @@
@@ -42,8 +38,6 @@ Index: b/HDF4/hdf/util/Makefile.am
vshow_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
#############################################################################
-Index: b/HDF4/config/commence.am
-===================================================================
--- a/HDF4/config/commence.am
+++ b/HDF4/config/commence.am
@@ -21,8 +21,8 @@
@@ -57,8 +51,6 @@ Index: b/HDF4/config/commence.am
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
-Index: b/HDF4/Makefile.in
-===================================================================
--- a/HDF4/Makefile.in
+++ b/HDF4/Makefile.in
@@ -322,8 +322,8 @@
@@ -72,8 +64,6 @@ Index: b/HDF4/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/hdf/Makefile.in
-===================================================================
--- a/HDF4/hdf/Makefile.in
+++ b/HDF4/hdf/Makefile.in
@@ -263,8 +263,8 @@
@@ -87,8 +77,6 @@ Index: b/HDF4/hdf/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/hdf/examples/Makefile.in
-===================================================================
--- a/HDF4/hdf/examples/Makefile.in
+++ b/HDF4/hdf/examples/Makefile.in
@@ -238,8 +238,8 @@
@@ -102,8 +90,6 @@ Index: b/HDF4/hdf/examples/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/hdf/fortran/Makefile.in
-===================================================================
--- a/HDF4/hdf/fortran/Makefile.in
+++ b/HDF4/hdf/fortran/Makefile.in
@@ -264,8 +264,8 @@
@@ -117,8 +103,6 @@ Index: b/HDF4/hdf/fortran/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/hdf/fortran/examples/Makefile.in
-===================================================================
--- a/HDF4/hdf/fortran/examples/Makefile.in
+++ b/HDF4/hdf/fortran/examples/Makefile.in
@@ -238,8 +238,8 @@
@@ -132,8 +116,6 @@ Index: b/HDF4/hdf/fortran/examples/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/hdf/src/Makefile.in
-===================================================================
--- a/HDF4/hdf/src/Makefile.in
+++ b/HDF4/hdf/src/Makefile.in
@@ -99,8 +99,8 @@
@@ -214,8 +196,6 @@ Index: b/HDF4/hdf/src/Makefile.in
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-Index: b/HDF4/hdf/test/Makefile.in
-===================================================================
--- a/HDF4/hdf/test/Makefile.in
+++ b/HDF4/hdf/test/Makefile.in
@@ -299,8 +299,8 @@
@@ -229,8 +209,6 @@ Index: b/HDF4/hdf/test/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/hdf/util/Makefile.in
-===================================================================
--- a/HDF4/hdf/util/Makefile.in
+++ b/HDF4/hdf/util/Makefile.in
@@ -391,8 +391,8 @@
@@ -255,8 +233,6 @@ Index: b/HDF4/hdf/util/Makefile.in
vshow_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
#############################################################################
-Index: b/HDF4/man/Makefile.in
-===================================================================
--- a/HDF4/man/Makefile.in
+++ b/HDF4/man/Makefile.in
@@ -255,8 +255,8 @@
@@ -270,8 +246,6 @@ Index: b/HDF4/man/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/Makefile.in
+++ b/HDF4/mfhdf/Makefile.in
@@ -263,8 +263,8 @@
@@ -285,8 +259,6 @@ Index: b/HDF4/mfhdf/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/dumper/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/dumper/Makefile.in
+++ b/HDF4/mfhdf/dumper/Makefile.in
@@ -261,8 +261,8 @@
@@ -300,8 +272,6 @@ Index: b/HDF4/mfhdf/dumper/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/examples/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/examples/Makefile.in
+++ b/HDF4/mfhdf/examples/Makefile.in
@@ -238,8 +238,8 @@
@@ -315,8 +285,6 @@ Index: b/HDF4/mfhdf/examples/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/fortran/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/fortran/Makefile.in
+++ b/HDF4/mfhdf/fortran/Makefile.in
@@ -330,8 +330,8 @@
@@ -330,8 +298,6 @@ Index: b/HDF4/mfhdf/fortran/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/fortran/examples/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/fortran/examples/Makefile.in
+++ b/HDF4/mfhdf/fortran/examples/Makefile.in
@@ -238,8 +238,8 @@
@@ -345,8 +311,6 @@ Index: b/HDF4/mfhdf/fortran/examples/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/hdfimport/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/hdfimport/Makefile.in
+++ b/HDF4/mfhdf/hdfimport/Makefile.in
@@ -270,8 +270,8 @@
@@ -360,8 +324,6 @@ Index: b/HDF4/mfhdf/hdfimport/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/hdiff/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/hdiff/Makefile.in
+++ b/HDF4/mfhdf/hdiff/Makefile.in
@@ -266,8 +266,8 @@
@@ -375,8 +337,6 @@ Index: b/HDF4/mfhdf/hdiff/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/hrepack/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/hrepack/Makefile.in
+++ b/HDF4/mfhdf/hrepack/Makefile.in
@@ -282,8 +282,8 @@
@@ -390,8 +350,6 @@ Index: b/HDF4/mfhdf/hrepack/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/libsrc/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/libsrc/Makefile.in
+++ b/HDF4/mfhdf/libsrc/Makefile.in
@@ -300,8 +300,8 @@
@@ -405,8 +363,6 @@ Index: b/HDF4/mfhdf/libsrc/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/ncdump/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/ncdump/Makefile.in
+++ b/HDF4/mfhdf/ncdump/Makefile.in
@@ -289,8 +289,8 @@
@@ -420,8 +376,6 @@ Index: b/HDF4/mfhdf/ncdump/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/ncgen/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/ncgen/Makefile.in
+++ b/HDF4/mfhdf/ncgen/Makefile.in
@@ -304,8 +304,8 @@
@@ -435,8 +389,6 @@ Index: b/HDF4/mfhdf/ncgen/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/nctest/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/nctest/Makefile.in
+++ b/HDF4/mfhdf/nctest/Makefile.in
@@ -258,8 +258,8 @@
@@ -450,8 +402,6 @@ Index: b/HDF4/mfhdf/nctest/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/test/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/test/Makefile.in
+++ b/HDF4/mfhdf/test/Makefile.in
@@ -268,8 +268,8 @@
@@ -465,8 +415,6 @@ Index: b/HDF4/mfhdf/test/Makefile.in
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
-Index: b/HDF4/mfhdf/xdr/Makefile.in
-===================================================================
--- a/HDF4/mfhdf/xdr/Makefile.in
+++ b/HDF4/mfhdf/xdr/Makefile.in
@@ -290,8 +290,8 @@
diff --git a/debian/patches/config b/debian/patches/config
index 21b703a..c41010a 100644
--- a/debian/patches/config
+++ b/debian/patches/config
@@ -1,10 +1,8 @@
Description: Customize library configuration.
Author: Francesco Paolo Lovergine <fran...@debian.org>
-Index: trunk/HDF4/config/ia64-linux-gnu
-===================================================================
---- trunk.orig/HDF4/config/ia64-linux-gnu 2008-06-22 22:59:13.000000000
+0200
-+++ trunk/HDF4/config/ia64-linux-gnu 2008-06-22 23:00:06.000000000 +0200
+--- a/HDF4/config/ia64-linux-gnu
++++ b/HDF4/config/ia64-linux-gnu
@@ -94,9 +94,9 @@
case $CC_BASENAME in
gcc)
@@ -30,10 +28,8 @@ Index: trunk/HDF4/config/ia64-linux-gnu
PROFILE_FFLAGS="-pg"
;;
-Index: trunk/HDF4/config/linux-gnu
-===================================================================
---- trunk.orig/HDF4/config/linux-gnu 2008-06-22 22:54:48.000000000 +0200
-+++ trunk/HDF4/config/linux-gnu 2008-06-22 22:59:06.000000000 +0200
+--- a/HDF4/config/linux-gnu
++++ b/HDF4/config/linux-gnu
@@ -26,8 +26,8 @@
fi
diff --git a/debian/patches/fmpool b/debian/patches/fmpool
index 88bfaf1..754f25e 100644
--- a/debian/patches/fmpool
+++ b/debian/patches/fmpool
@@ -1,10 +1,8 @@
Description: Fix fmpool build.
Author: Francesco Paolo Lovergine <fran...@debian.org>
-Index: libhdf4-4.2r3/HDF4/hdf/fmpool/config/mh-linux
-===================================================================
---- libhdf4-4.2r3.orig/HDF4/hdf/fmpool/config/mh-linux 2008-06-19
12:36:12.000000000 +0200
-+++ libhdf4-4.2r3/HDF4/hdf/fmpool/config/mh-linux 2008-06-19
12:36:22.000000000 +0200
+--- a/HDF4/hdf/fmpool/config/mh-linux
++++ b/HDF4/hdf/fmpool/config/mh-linux
@@ -18,7 +18,7 @@
#AUXFLAGS= -DPURIFY -DSTATISTICS -DSTAT_DEBUG
#AUXFLAGS= -DHAVE_GETRUSAGE -DSTATISTICS
@@ -14,10 +12,8 @@ Index: libhdf4-4.2r3/HDF4/hdf/fmpool/config/mh-linux
LDFLAGS=
LDLIBS=
-Index: libhdf4-4.2r3/HDF4/hdf/fmpool/config.guess
-===================================================================
---- libhdf4-4.2r3.orig/HDF4/hdf/fmpool/config.guess 2008-06-19
12:40:11.000000000 +0200
-+++ libhdf4-4.2r3/HDF4/hdf/fmpool/config.guess 2008-06-19 12:40:26.000000000
+0200
+--- a/HDF4/hdf/fmpool/config.guess
++++ b/HDF4/hdf/fmpool/config.guess
@@ -1,7 +1,11 @@
-#!/bin/sh
+#! /bin/sh
@@ -1687,10 +1683,8 @@ Index: libhdf4-4.2r3/HDF4/hdf/fmpool/config.guess
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-Index: libhdf4-4.2r3/HDF4/hdf/fmpool/config.sub
-===================================================================
---- libhdf4-4.2r3.orig/HDF4/hdf/fmpool/config.sub 2008-06-19
12:41:12.000000000 +0200
-+++ libhdf4-4.2r3/HDF4/hdf/fmpool/config.sub 2008-06-19 12:41:25.000000000
+0200
+--- a/HDF4/hdf/fmpool/config.sub
++++ b/HDF4/hdf/fmpool/config.sub
@@ -1,9 +1,14 @@
-#!/bin/sh
-# Configuration validation subroutine script, version 1.1.
diff --git a/debian/patches/hdf-4.2.10-aarch64.patch
b/debian/patches/hdf-4.2.10-aarch64.patch
index 661f07d..8b73330 100644
--- a/debian/patches/hdf-4.2.10-aarch64.patch
+++ b/debian/patches/hdf-4.2.10-aarch64.patch
@@ -2,10 +2,8 @@ Description: Add Aarch64 support -only part of the original
patch
Author: Marcin Juswkiewicz
Origin: https://bugs.launchpad.net/ubuntu/+source/libhdf4/+bug/1296303
-Index: hdf-4.2.10/mfhdf/ncgen/ncgen.l
-===================================================================
---- hdf-4.2.10.orig/mfhdf/ncgen/ncgen.l
-+++ hdf-4.2.10/mfhdf/ncgen/ncgen.l
+--- a/mfhdf/ncgen/ncgen.l
++++ b/mfhdf/ncgen/ncgen.l
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss
yyerror(errstr);
}
@@ -15,10 +13,8 @@ Index: hdf-4.2.10/mfhdf/ncgen/ncgen.l
if (dd < INT_MIN || dd > INT_MAX)
#else
if (dd < LONG_MIN || dd > LONG_MAX)
-Index: hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
-===================================================================
---- hdf-4.2.10.orig/mfhdf/ncgen/ncgenyy.c
-+++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c
+--- a/mfhdf/ncgen/ncgenyy.c
++++ b/mfhdf/ncgen/ncgenyy.c
@@ -989,7 +989,7 @@ YY_RULE_SETUP
yyerror(errstr);
}
diff --git a/debian/patches/man b/debian/patches/man
index 7981790..0076c63 100644
--- a/debian/patches/man
+++ b/debian/patches/man
@@ -1,11 +1,9 @@
Description: Fix paths in manpage.
Author: Francesco Paolo Lovergine <fran...@debian.org>
-Index: b/man/hdf.1
-===================================================================
--- a/man/hdf.1
+++ b/man/hdf.1
-@@ -6,9 +6,7 @@
+@@ -6,9 +6,7 @@ hdf \- Hierarchical Data Format library
.ft B
-lmfhdf -ldf -ljpeg -lz [ -lsz ]
.sp 0
@@ -16,7 +14,7 @@ Index: b/man/hdf.1
.SH DESCRIPTION
HDF is a multi-object file format that facilitates the transfer of various
-@@ -161,13 +159,13 @@
+@@ -161,13 +159,13 @@ Email: h...@hdfgroup.org
.SH FILES
.PD 0
.TP 30
diff --git a/debian/patches/shared_fortran b/debian/patches/shared_fortran
index 4c02c12..c13267a 100644
--- a/debian/patches/shared_fortran
+++ b/debian/patches/shared_fortran
@@ -1,8 +1,6 @@
Description: Enable support for shared fortran libraries.
Author: Francesco Paolo Lovergine <fran...@debian.org>
-Index: b/HDF4/configure.ac
-===================================================================
--- a/HDF4/configure.ac
+++ b/HDF4/configure.ac
@@ -224,15 +224,6 @@ AC_SUBST([BUILD_FORTRAN])
@@ -22,8 +20,6 @@ Index: b/HDF4/configure.ac
AC_PROG_INSTALL
AC_PROG_LN_S
-Index: b/HDF4/configure
-===================================================================
--- a/HDF4/configure
+++ b/HDF4/configure
@@ -5981,21 +5981,6 @@
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/hdf4.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
