[hdf4] 07/10: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Thu Jun 30 23:23:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository hdf4.
commit 54458d96cd2995ee9c24def250e022eca2869cbf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jun 30 21:00:38 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/enablesharedfortran.diff | 2 +-
debian/patches/install-examples.diff | 16 ++++++++--------
debian/patches/kfreebsd | 2 +-
debian/patches/ppc64el.diff | 8 ++++----
debian/patches/spelling-errors.patch | 26 +++++++++++++-------------
6 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3cf3164..4517789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libhdf4 (4.2.12-1) UNRELEASED; urgency=medium
* Update copyright file, update copyright years for The HDF Group.
* Drop unused ARCHIVE variable from rules file.
* Drop obsolete README.source.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Thu, 30 Jun 2016 19:38:29 +0200
diff --git a/debian/patches/enablesharedfortran.diff b/debian/patches/enablesharedfortran.diff
index ced08e6..744be80 100644
--- a/debian/patches/enablesharedfortran.diff
+++ b/debian/patches/enablesharedfortran.diff
@@ -3,7 +3,7 @@ Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
--- a/configure.ac
+++ b/configure.ac
-@@ -224,15 +224,16 @@ AC_SUBST([BUILD_FORTRAN])
+@@ -284,15 +284,16 @@ AM_CONDITIONAL([BUILD_JAVA_CONDITIONAL],
## Build static libraries by default. Furthermore, fortran shared libraries
## are unsupported. Disallow a user from enabling both shared libraries and
## fortran.
diff --git a/debian/patches/install-examples.diff b/debian/patches/install-examples.diff
index 9faed74..5259583 100644
--- a/debian/patches/install-examples.diff
+++ b/debian/patches/install-examples.diff
@@ -49,7 +49,7 @@ Author: Matthias Klose <doko at ubuntu.com>
--- a/hdf/examples/Makefile.in
+++ b/hdf/examples/Makefile.in
-@@ -1151,7 +1151,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
+@@ -1182,7 +1182,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
AN_read_annotation: $(srcdir)/AN_read_annotation.c
# How to create EXAMPLEDIR if it doesn't already exist
@@ -58,7 +58,7 @@ Author: Matthias Klose <doko at ubuntu.com>
mkdir -p $@
# Install and uninstall rules. We install the source files, not the
-@@ -1161,27 +1161,27 @@ install-data-local:
+@@ -1192,27 +1192,27 @@ install-data-local:
uninstall-local:
@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
@@ -95,7 +95,7 @@ Author: Matthias Klose <doko at ubuntu.com>
--- a/hdf/fortran/examples/Makefile.in
+++ b/hdf/fortran/examples/Makefile.in
-@@ -1108,7 +1108,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
+@@ -1139,7 +1139,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
AN_read_annotation: $(srcdir)/AN_read_annotation.f
# How to create EXAMPLEDIR if it doesn't already exist
@@ -104,7 +104,7 @@ Author: Matthias Klose <doko at ubuntu.com>
mkdir -p $@
# Install and uninstall rules. We install the source files, not the
-@@ -1118,27 +1118,27 @@ install-data-local:
+@@ -1149,27 +1149,27 @@ install-data-local:
uninstall-local:
@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
@@ -141,7 +141,7 @@ Author: Matthias Klose <doko at ubuntu.com>
--- a/mfhdf/examples/Makefile.in
+++ b/mfhdf/examples/Makefile.in
-@@ -1024,7 +1024,7 @@ get_attr: $(srcdir)/SD_get_attr.c
+@@ -1055,7 +1055,7 @@ get_attr: $(srcdir)/SD_get_attr.c
chunking_example: $(srcdir)/SD_chunking_example.c
# How to create EXAMPLEDIR if it doesn't already exist
@@ -150,7 +150,7 @@ Author: Matthias Klose <doko at ubuntu.com>
mkdir -p $@
# Install and uninstall rules. We install the source files, not the
-@@ -1034,27 +1034,27 @@ install-data-local:
+@@ -1065,27 +1065,27 @@ install-data-local:
uninstall-local:
@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
@@ -187,7 +187,7 @@ Author: Matthias Klose <doko at ubuntu.com>
--- a/mfhdf/fortran/examples/Makefile.in
+++ b/mfhdf/fortran/examples/Makefile.in
-@@ -1025,7 +1025,7 @@ SD_compress_sds: $(srcdir)/SD_compress_s
+@@ -1056,7 +1056,7 @@ SD_compress_sds: $(srcdir)/SD_compress_s
SD_chunking_example: $(srcdir)/SD_chunking_example.f
# How to create EXAMPLEDIR if it doesn't already exist
@@ -196,7 +196,7 @@ Author: Matthias Klose <doko at ubuntu.com>
mkdir -p $@
# Install and uninstall rules. We install the source files, not the
-@@ -1035,27 +1035,27 @@ install-data-local:
+@@ -1066,27 +1066,27 @@ install-data-local:
uninstall-local:
@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd
index f4d0bf5..2974813 100644
--- a/debian/patches/kfreebsd
+++ b/debian/patches/kfreebsd
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
--- a/configure.ac
+++ b/configure.ac
-@@ -805,7 +805,7 @@ AC_CHECK_FUNCS([fork system vfork wait])
+@@ -865,7 +865,7 @@ AC_CHECK_FUNCS([fork system vfork wait])
## These header files should probably be generated by autoconf instead
## of being copied depending upon the host.
case "$host" in
diff --git a/debian/patches/ppc64el.diff b/debian/patches/ppc64el.diff
index 6b67119..2d64914 100644
--- a/debian/patches/ppc64el.diff
+++ b/debian/patches/ppc64el.diff
@@ -3,7 +3,7 @@ Author: Matthias Klose <doko at ubuntu.com>
--- a/configure
+++ b/configure
-@@ -8815,7 +8815,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -9928,7 +9928,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -15,7 +15,7 @@ Author: Matthias Klose <doko at ubuntu.com>
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -8834,7 +8837,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -9947,7 +9950,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -29,7 +29,7 @@ Author: Matthias Klose <doko at ubuntu.com>
s390*-*linux*|s390*-*tpf*)
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -2503,7 +2503,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -2516,7 +2516,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -41,7 +41,7 @@ Author: Matthias Klose <doko at ubuntu.com>
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -2522,7 +2525,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -2535,7 +2538,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index 0742d66..99ec299 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -175,7 +175,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
--- a/release_notes/HISTORY.txt
+++ b/release_notes/HISTORY.txt
-@@ -5239,7 +5239,7 @@ follow the instructions listed in:
+@@ -5591,7 +5591,7 @@ follow the instructions listed in:
the "make" in some old systems does not support the
creation commands.)
. A bug was found in the "mfhdf.h" file late in the testing
@@ -186,7 +186,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
the CM5 version. Please retrieve the fix there.
--- a/hdf/util/he_disp.c
+++ b/hdf/util/he_disp.c
-@@ -45,7 +45,7 @@ HEdisplay(HE_CMD * cmd)
+@@ -41,7 +41,7 @@ HEdisplay(HE_CMD * cmd)
printf("display [-position <xpos> <ypos>] [-expansion <exp>] [-large]\n");
printf("\t-position\tImage position on console screen\n");
printf("\t-expansion\tImage expansion factor\n");
@@ -197,7 +197,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
center = 0;
--- a/hdf/test/chunks.c
+++ b/hdf/test/chunks.c
-@@ -1386,7 +1386,7 @@ test_chunks(void)
+@@ -1382,7 +1382,7 @@ test_chunks(void)
/* The following tests will work if Number type conversion
@@ -208,7 +208,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/*
--- a/mfhdf/dumper/hdp_vd.c
+++ b/mfhdf/dumper/hdp_vd.c
-@@ -1003,7 +1003,7 @@ dvd(dump_info_t * dumpvd_opts,
+@@ -999,7 +999,7 @@ dvd(dump_info_t * dumpvd_opts,
break;
default:
@@ -376,7 +376,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
.IP "\fB-d\fP \fIfloat_digits[,double_digits]\fP"
--- a/hdf/src/herr.h
+++ b/hdf/src/herr.h
-@@ -158,7 +158,7 @@ typedef enum
+@@ -151,7 +151,7 @@ typedef enum
DFE_PUTELEM, /* Hputelement failed in some way */
DFE_GETELEM, /* Hgetelement failed in some way */
DFE_CANTLINK, /* Can't initialize link information */
@@ -385,7 +385,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* Old group interface errors */
DFE_BADGROUP, /* Error from DFdiread in opening a group */
-@@ -344,7 +344,7 @@ PRIVATE const struct error_messages_t er
+@@ -351,7 +351,7 @@ PRIVATE const struct error_messages_t er
{DFE_PUTELEM, "Hputelement failed in some way"},
{DFE_GETELEM, "Hgetelement failed in some way"},
{DFE_CANTLINK, "Can't initialize link information"},
@@ -396,7 +396,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
{DFE_BADGROUP, "Error from DFdiread in opening a group"},
--- a/hdf/src/hfiledd.c
+++ b/hdf/src/hfiledd.c
-@@ -65,8 +65,8 @@ EXPORTED ROUTINES
+@@ -61,8 +61,8 @@ EXPORTED ROUTINES
DD list functions:
HTPstart - Initialize the DD list from disk (creates the DD list in memory)
HTPinit - Create a new DD list (creates the DD list in memory)
@@ -409,7 +409,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
HTInew_dd_block - create a new (empty) DD block
--- a/hdf/src/mcache.c
+++ b/hdf/src/mcache.c
-@@ -504,7 +504,7 @@ mcache_get(
+@@ -500,7 +500,7 @@ mcache_get(
/* Check for attempting to retrieve a non-existent page.
* remember pages go from 1 ->npages */
if (pgno > mp->npages)
@@ -418,7 +418,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
#ifdef STATISTICS
++mp->pageget;
-@@ -880,7 +880,7 @@ mcache_page_sync(
+@@ -876,7 +876,7 @@ mcache_page_sync(
/* Check for attempting to sync a non-existent page.
* remember pages go from 1 ->npages */
if (pgno > mp->npages)
@@ -427,7 +427,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* Check for a page that is cached. */
if ((bp = mcache_look(mp, pgno)) != NULL)
-@@ -1176,7 +1176,7 @@ mcache_look(
+@@ -1172,7 +1172,7 @@ mcache_look(
/* Check for attempt to look up a non-existent page. */
if (pgno > mp->npages)
@@ -438,7 +438,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
head = &mp->hqh[HASHKEY(pgno)];
--- a/hdf/test/file.c
+++ b/hdf/test/file.c
-@@ -165,7 +165,7 @@ test_hfile(void)
+@@ -161,7 +161,7 @@ test_hfile(void)
ret = Hnextread(aid1, 100, DFREF_WILDCARD, DF_CURRENT);
if (ret != FAIL)
{
@@ -447,7 +447,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
__LINE__);
errors++;
}
-@@ -180,7 +180,7 @@ test_hfile(void)
+@@ -176,7 +176,7 @@ test_hfile(void)
ret = Hnextread(aid1, DFTAG_WILDCARD, 3, DF_CURRENT);
if (ret != FAIL)
{
@@ -469,7 +469,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
if (ncclose (cdfid) == -1) {
--- a/mfhdf/test/hdftest.c
+++ b/mfhdf/test/hdftest.c
-@@ -447,7 +447,7 @@ main(int argc, char *argv[])
+@@ -444,7 +444,7 @@ main(int argc, char *argv[])
status = SDfindattr(newsds, "blarf");
if(status != FAIL)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git
More information about the Pkg-grass-devel
mailing list