[Git][debian-gis-team/hdf4][master] 5 commits: Refresh patches.
Bas Couwenberg
gitlab at salsa.debian.org
Sat Mar 16 09:17:52 GMT 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / hdf4
Commits:
3b03ba38 by Bas Couwenberg at 2019-03-16T08:43:01Z
Refresh patches.
- - - - -
e2f0bcf2 by Bas Couwenberg at 2019-03-16T08:43:16Z
Add upstream metadata.
- - - - -
9f7fdf7e by Bas Couwenberg at 2019-03-16T08:45:15Z
Update Source URL in copyright file.
- - - - -
0c1bddd2 by Bas Couwenberg at 2019-03-16T09:07:09Z
Add lintian overrides for file-references-package-build-path.
- - - - -
6cabfc25 by Bas Couwenberg at 2019-03-16T09:07:09Z
Set distribution to experimental.
- - - - -
20 changed files:
- debian/changelog
- debian/copyright
- + debian/hdf4-tools.lintian-overrides
- + debian/libhdf4-0-alt.lintian-overrides
- + debian/libhdf4-0.lintian-overrides
- + debian/libhdf4-alt-dev.lintian-overrides
- + debian/libhdf4-dev.lintian-overrides
- debian/patches/64bit
- debian/patches/enablesharedfortran.diff
- debian/patches/hdf-4.2.10-aarch64.patch
- debian/patches/hdfi.h
- debian/patches/kfreebsd
- debian/patches/manpage-has-errors-from-man.patch
- debian/patches/mips64.diff
- debian/patches/missing-includes.diff
- debian/patches/ppc64el.diff
- debian/patches/ppc64el.patch
- debian/patches/reproducible-builds.patch
- debian/patches/spelling-errors.patch
- + debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,16 @@
-libhdf4 (4.2.14-1) UNRELEASED; urgency=medium
+libhdf4 (4.2.14-1~exp1) experimental; urgency=medium
+
+ * Team upload.
[ Bas Couwenberg ]
* Bump Standards-Version to 4.3.0, no changes.
* Add Build-Depends-Package field to symbols files.
* Update watch file to use releases directory instead of HDF_Current.
* Remove package name from lintian overrides.
+ * Refresh patches.
+ * Add upstream metadata.
+ * Update Source URL in copyright file.
+ * Add lintian overrides for file-references-package-build-path.
[ Johan Van de Wauw ]
* New upstream version 4.2.14
@@ -13,7 +19,7 @@ libhdf4 (4.2.14-1) UNRELEASED; urgency=medium
* Also update mail in control.in
* Update release version
- -- Johan Van de Wauw <johan at gisky.be> Tue, 11 Dec 2018 20:06:10 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 16 Mar 2019 09:47:59 +0100
libhdf4 (4.2.13-4) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: HDF4
Upstream-Contact: HDF Group <help at hdfgroup.org>
-Source: https://support.hdfgroup.org/ftp/HDF/HDF_Current/src/
+Source: https://support.hdfgroup.org/ftp/HDF/releases/
Files: *
Copyright: 2006-2016, The HDF Group
=====================================
debian/hdf4-tools.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Source uses __FILE__ macro
+file-references-package-build-path *
+
=====================================
debian/libhdf4-0-alt.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Source uses __FILE__ macro
+file-references-package-build-path *
+
=====================================
debian/libhdf4-0.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Source uses __FILE__ macro
+file-references-package-build-path *
+
=====================================
debian/libhdf4-alt-dev.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# -fdebug-prefix-map
+file-references-package-build-path *.settings
+
=====================================
debian/libhdf4-dev.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# -fdebug-prefix-map
+file-references-package-build-path *.settings
+
=====================================
debian/patches/64bit
=====================================
@@ -1,9 +1,9 @@
Description: Additional 64bit architectures.
Author: Francesco Paolo Lovergine <frankie at debian.org>
---- libhdf4.orig/mfhdf/libsrc/netcdf.h.in
-+++ libhdf4/mfhdf/libsrc/netcdf.h.in
-@@ -293,7 +293,7 @@
+--- a/mfhdf/libsrc/netcdf.h.in
++++ b/mfhdf/libsrc/netcdf.h.in
+@@ -293,7 +293,7 @@ typedef double ncdouble;
/*
* Variables/attributes of type NC_LONG should use the C type 'nclong'
*/
=====================================
debian/patches/enablesharedfortran.diff
=====================================
@@ -1,9 +1,9 @@
Description: Enable support for shared fortran libraries.
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
---- libhdf4.orig/configure.ac
-+++ libhdf4/configure.ac
-@@ -283,15 +283,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,15 +283,16 @@ fi
## Build static libraries by default. Furthermore, fortran shared libraries
## are unsupported. Disallow a user from enabling both shared libraries and
## fortran.
=====================================
debian/patches/hdf-4.2.10-aarch64.patch
=====================================
@@ -2,9 +2,9 @@ Description: Add Aarch64 support -only part of the original patch
Author: Marcin Juswkiewicz
Origin: https://bugs.launchpad.net/ubuntu/+source/libhdf4/+bug/1296303
---- libhdf4.orig/mfhdf/ncgen/ncgen.l
-+++ libhdf4/mfhdf/ncgen/ncgen.l
-@@ -113,7 +113,7 @@
+--- a/mfhdf/ncgen/ncgen.l
++++ b/mfhdf/ncgen/ncgen.l
+@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss
yyerror(errstr);
}
@@ -13,9 +13,9 @@ Origin: https://bugs.launchpad.net/ubuntu/+source/libhdf4/+bug/1296303
if (dd < INT_MIN || dd > INT_MAX)
#else
if (dd < LONG_MIN || dd > LONG_MAX)
---- libhdf4.orig/mfhdf/ncgen/ncgenyy.c
-+++ libhdf4/mfhdf/ncgen/ncgenyy.c
-@@ -989,7 +989,7 @@
+--- a/mfhdf/ncgen/ncgenyy.c
++++ b/mfhdf/ncgen/ncgenyy.c
+@@ -989,7 +989,7 @@ YY_RULE_SETUP
yyerror(errstr);
}
=====================================
debian/patches/hdfi.h
=====================================
@@ -1,8 +1,8 @@
Description: Support additional architectures.
Author: Francesco Paolo Lovergine <frankie at debian.org>
---- libhdf4.orig/hdf/src/hdfi.h
-+++ libhdf4/hdf/src/hdfi.h
+--- a/hdf/src/hdfi.h
++++ b/hdf/src/hdfi.h
@@ -48,6 +48,7 @@
/* 8 - Cray IEEE */
/* (i.e. Big-Endian, all 64-bit architecture w/IEEE Floats) */
@@ -32,7 +32,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
/* I/O library constants */
#define UNIXUNBUFIO 1
-@@ -288,7 +296,7 @@
+@@ -288,7 +296,7 @@ typedef int hdf_pint_t;
#endif /* IBM6000 */
@@ -41,7 +41,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
#ifndef HP9000
#define HP9000
-@@ -347,6 +355,10 @@
+@@ -347,6 +355,10 @@ typedef int hdf_pint_t;
/* what each does */
#define JMEMSYS MEM_ANSI
@@ -52,7 +52,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
#endif /* HP9000 */
-@@ -666,6 +678,410 @@
+@@ -666,6 +678,410 @@ typedef int hdf_pint_t;
#endif /* !(defined(__APPLE__)) */
/*-----------------------------------------------------*/
@@ -463,7 +463,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
#if defined(NEXT) || defined(NeXT)
#ifndef NEXT
-@@ -928,7 +1344,11 @@
+@@ -928,7 +1344,11 @@ Please check your Makefile.
#include <sys/file.h> /* for unbuffered i/o stuff */
#include <sys/stat.h>
@@ -476,7 +476,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
typedef void VOID;
typedef void *VOIDP;
typedef char *_fcd;
-@@ -952,6 +1372,11 @@
+@@ -952,6 +1372,11 @@ typedef long hdf_pint_t;
#define _fcdtocp(desc) (desc)
#define FILELIB UNIXBUFIO
@@ -488,7 +488,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
/* Determine the memory manager we are going to use. Valid values are: */
-@@ -1097,6 +1522,8 @@
+@@ -1097,6 +1522,8 @@ typedef long hdf_pint_t;
#define _fcdtocp(desc) (desc)
#define FILELIB UNIXBUFIO
@@ -497,7 +497,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
/* Determine the memory manager we are going to use. Valid values are: */
-@@ -1111,6 +1538,66 @@
+@@ -1111,6 +1538,66 @@ typedef long hdf_pint_t;
#endif /* IA64 */
@@ -564,8 +564,8 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
#ifndef GOT_MACHINE
No machine type has been defined. Your Makefile needs to have someing like
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
---- libhdf4.orig/hdf/src/hconv.h
-+++ libhdf4/hdf/src/hconv.h
+--- a/hdf/src/hconv.h
++++ b/hdf/src/hconv.h
@@ -59,7 +59,7 @@
/* CONSTANT DEFINITIONS */
/*****************************************************************************/
=====================================
debian/patches/kfreebsd
=====================================
@@ -1,9 +1,9 @@
Description: Add support for kFreeBSD architectures.
Author: Francesco Paolo Lovergine <frankie at debian.org>
---- libhdf4.orig/configure.ac
-+++ libhdf4/configure.ac
-@@ -864,7 +864,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -864,7 +864,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
@@ -12,9 +12,9 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
*-freebsd*) BAR="fbsd" ;;
*-ibm-aix*) BAR="aix" ;;
sparc64-*-solaris2*) BAR="solaris64" ;;
---- libhdf4.orig/hdf/src/hdfi.h
-+++ libhdf4/hdf/src/hdfi.h
-@@ -1392,7 +1392,7 @@
+--- a/hdf/src/hdfi.h
++++ b/hdf/src/hdfi.h
+@@ -1392,7 +1392,7 @@ typedef long hdf_pint_t;
/*-----------------------------------------------------*/
#endif /*power PC 5 64 */
/* Linux 64 */
=====================================
debian/patches/manpage-has-errors-from-man.patch
=====================================
@@ -2,9 +2,9 @@ Description: Fix manpage-has-errors-from-man lintian issue.
warning: macro `1f' not defined
Author: Bas Couwenberg <sebastic at debian.org>
---- libhdf4.orig/mfhdf/ncgen/ncgen.1
-+++ libhdf4/mfhdf/ncgen/ncgen.1
-@@ -327,7 +327,7 @@
+--- a/mfhdf/ncgen/ncgen.1
++++ b/mfhdf/ncgen/ncgen.1
+@@ -327,7 +327,7 @@ are all acceptable \fIfloat\fP constants
-2.0f
3.14159265358979f // will be truncated to less precision
1.f
=====================================
debian/patches/mips64.diff
=====================================
@@ -6,9 +6,9 @@ Description: Fix FTBFS on mips64el.
Author: James Cowgill <james410 at cowgill.org.uk>
Bug-Debian: https://bugs.debian.org/779624
---- libhdf4.orig/mfhdf/libsrc/xdrposix.c
-+++ libhdf4/mfhdf/libsrc/xdrposix.c
-@@ -287,12 +287,6 @@
+--- a/mfhdf/libsrc/xdrposix.c
++++ b/mfhdf/libsrc/xdrposix.c
+@@ -287,12 +287,6 @@ static void xdrposix_destroy();
static struct xdr_ops xdrposix_ops = {
xdrposix_getlong, /* deserialize a 32-bit int */
xdrposix_putlong, /* serialize a 32-bit int */
=====================================
debian/patches/missing-includes.diff
=====================================
@@ -1,8 +1,8 @@
Description: Fix missing includes.
Author: Matthias Klose <doko at ubuntu.com>
---- libhdf4.orig/hdf/util/hdf2gif.c
-+++ libhdf4/hdf/util/hdf2gif.c
+--- a/hdf/util/hdf2gif.c
++++ b/hdf/util/hdf2gif.c
@@ -13,6 +13,7 @@
#include "gif.h"
=====================================
debian/patches/ppc64el.diff
=====================================
@@ -1,9 +1,9 @@
Description: Add support for ppc64el architecture.
Author: Matthias Klose <doko at ubuntu.com>
---- libhdf4.orig/configure
-+++ libhdf4/configure
-@@ -9921,7 +9921,10 @@
+--- a/configure
++++ b/configure
+@@ -9921,7 +9921,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*)
-@@ -9940,7 +9943,10 @@
+@@ -9940,7 +9943,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -27,9 +27,9 @@ Author: Matthias Klose <doko at ubuntu.com>
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
---- libhdf4.orig/aclocal.m4
-+++ libhdf4/aclocal.m4
-@@ -2516,7 +2516,10 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -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*)
-@@ -2535,7 +2538,10 @@
+@@ -2535,7 +2538,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -53,9 +53,9 @@ Author: Matthias Klose <doko at ubuntu.com>
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
---- libhdf4.orig/m4/libtool.m4
-+++ libhdf4/m4/libtool.m4
-@@ -1326,7 +1326,10 @@
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1326,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -67,7 +67,7 @@ Author: Matthias Klose <doko at ubuntu.com>
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -1345,7 +1348,10 @@
+@@ -1345,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
=====================================
debian/patches/ppc64el.patch
=====================================
@@ -1,9 +1,9 @@
Description: Fix endianness definition for ppc64el.
Author: Fernando Seiti Furusato <ferseiti at br.ibm.com>
---- libhdf4.orig/mfhdf/libsrc/xdrposix.c
-+++ libhdf4/mfhdf/libsrc/xdrposix.c
-@@ -435,7 +435,7 @@
+--- a/mfhdf/libsrc/xdrposix.c
++++ b/mfhdf/libsrc/xdrposix.c
+@@ -435,7 +435,7 @@ xdrposix_getlong(xdrs, lp)
#endif
{
unsigned char *up = (unsigned char *)lp ;
@@ -12,7 +12,7 @@ Author: Fernando Seiti Furusato <ferseiti at br.ibm.com>
*lp = 0 ;
up += (sizeof(long) - 4) ;
#endif
-@@ -462,7 +462,7 @@
+@@ -462,7 +462,7 @@ xdrposix_putlong(xdrs, lp)
netlong mycopy = htonl(*lp);
up = (unsigned char *)&mycopy;
#endif
=====================================
debian/patches/reproducible-builds.patch
=====================================
@@ -2,8 +2,8 @@ Description: Remove settings that make the build unreproducible.
Author: Bas Couwenberg <sebastic at debian.org>
Bug-Debian: https://bugs.debian.org/825540
---- libhdf4.orig/libhdf4.settings.in
-+++ libhdf4/libhdf4.settings.in
+--- a/libhdf4.settings.in
++++ b/libhdf4.settings.in
@@ -4,11 +4,7 @@
General Information:
-------------------
@@ -16,8 +16,8 @@ Bug-Debian: https://bugs.debian.org/825540
Libraries: @STATIC_SHARED@
Installation point: @prefix@
---- libhdf4.orig/config/cmake/libhdf4.settings.cmake.in
-+++ libhdf4/config/cmake/libhdf4.settings.cmake.in
+--- a/config/cmake/libhdf4.settings.cmake.in
++++ b/config/cmake/libhdf4.settings.cmake.in
@@ -4,11 +4,7 @@
General Information:
-------------------
=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -11,9 +11,9 @@ Description: Fix spelling errors.
converion -> conversion
Author: Bas Couwenberg <sebastic at debian.org>
---- libhdf4.orig/hdf/util/gif2hdf.c
-+++ libhdf4/hdf/util/gif2hdf.c
-@@ -57,7 +57,7 @@
+--- a/hdf/util/gif2hdf.c
++++ b/hdf/util/gif2hdf.c
+@@ -57,7 +57,7 @@ char *argc[];
if (!(fpGif = fopen(GIFFileName,"rb"))) {
printf("Unable to open GIF file for reading.\n");
@@ -22,9 +22,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
exit(-1);
}
---- libhdf4.orig/hdf/util/gifread.c
-+++ libhdf4/hdf/util/gifread.c
-@@ -79,8 +79,8 @@
+--- a/hdf/util/gifread.c
++++ b/hdf/util/gifread.c
+@@ -79,8 +79,8 @@ BYTE *MemGif;
** Global Color Table (if any) from a GIF image file. The information
** is stored in a GIFHEAD structure.
**
@@ -35,7 +35,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
int
ReadGifHeader(GifHead, MemGif2)
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ BYTE **MemGif2; /* GIF image fi
return(-1);
*/
@@ -44,7 +44,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
-@@ -147,8 +147,8 @@
+@@ -147,8 +147,8 @@ BYTE **MemGif2; /* GIF image fi
** Note that the ImageSeparator field value in the GIFIMAGEDESC
** structure is assigned by the function calling ReadGifImageDesc().
**
@@ -55,7 +55,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
int
ReadGifImageDesc(GifImageDesc, MemGif2)
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ BYTE **MemGif2; /* GIF image
while (ch1);
@@ -64,7 +64,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
-@@ -243,8 +243,8 @@
+@@ -243,8 +243,8 @@ BYTE **MemGif2; /* GIF image
** Note that the Introducer and Label field values in the GIFGRAPHICCONTROL
** structure are assigned by the function calling ReadGifGraphicControl().
**
@@ -75,7 +75,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
int
ReadGifGraphicControl(GifGraphicControl, MemGif2)
-@@ -257,7 +257,7 @@
+@@ -257,7 +257,7 @@ BYTE **MemGif2; /*
GifGraphicControl->GCEDump[i] = *(*MemGif2)++;
}
@@ -84,7 +84,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
-@@ -267,8 +267,8 @@
+@@ -267,8 +267,8 @@ BYTE **MemGif2; /*
** Note that the Introducer and Label field values in the GIFLPLAINTEXT
** structure are assigned by the function calling ReadGifPlainText().
**
@@ -95,7 +95,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
int
ReadGifPlainText(GifPlainText, MemGif2)
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ BYTE **MemGif2; /* GIF ima
return(-1);
*/
@@ -104,7 +104,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
-@@ -303,8 +303,8 @@
+@@ -303,8 +303,8 @@ BYTE **MemGif2; /* GIF ima
** Note that the Introducer and Label field values in the GIFAPPLICATION
** structure are assigned by the function calling ReadGifApplication().
**
@@ -115,7 +115,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
int
ReadGifApplication(GifApplication, MemGif2)
-@@ -328,7 +328,7 @@
+@@ -328,7 +328,7 @@ BYTE **MemGif2; /* GI
return(-1);
*/
@@ -124,7 +124,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
-@@ -338,8 +338,8 @@
+@@ -338,8 +338,8 @@ BYTE **MemGif2; /* GI
** Note that the Introducer and Label field values in the GIFCOMMENT
** structure are assigned by the function calling ReadGifComment().
**
@@ -135,7 +135,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
int
ReadGifComment(GifComment, MemGif2)
-@@ -353,7 +353,7 @@
+@@ -353,7 +353,7 @@ BYTE **MemGif2; /* GIF image
GifComment->Terminator = 0;
@@ -144,7 +144,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
}
-@@ -364,8 +364,8 @@
+@@ -364,8 +364,8 @@ BYTE **MemGif2; /* GIF image
** A GIF "sub-block" is a single count byte followed by 1 to 255
** additional data bytes.
**
@@ -155,9 +155,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
BYTE *
ReadDataSubBlocks(MemGif2 , DSize)
---- libhdf4.orig/hdf/util/writehdf.c
-+++ libhdf4/hdf/util/writehdf.c
-@@ -143,14 +143,14 @@
+--- a/hdf/util/writehdf.c
++++ b/hdf/util/writehdf.c
+@@ -143,14 +143,14 @@ char *GIFFileName;
/* GRSetCompress */
if ((status = GRsetcompress(ri_id, comp_type, &c_info)) == -1) {
@@ -174,9 +174,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
printf("%s\n", HEstring(HEvalue(1)));
exit(-1);
}
---- libhdf4.orig/release_notes/HISTORY.txt
-+++ libhdf4/release_notes/HISTORY.txt
-@@ -6118,7 +6118,7 @@
+--- a/release_notes/HISTORY.txt
++++ b/release_notes/HISTORY.txt
+@@ -6118,7 +6118,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
@@ -185,9 +185,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
extension only. The fix is not included in the source
release, but it is avalable in the binary release for
the CM5 version. Please retrieve the fix there.
---- libhdf4.orig/hdf/util/he_disp.c
-+++ libhdf4/hdf/util/he_disp.c
-@@ -41,7 +41,7 @@
+--- a/hdf/util/he_disp.c
++++ b/hdf/util/he_disp.c
+@@ -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");
@@ -196,9 +196,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
return HE_OK;
case HE_POSITION:
center = 0;
---- libhdf4.orig/hdf/test/chunks.c
-+++ libhdf4/hdf/test/chunks.c
-@@ -1382,7 +1382,7 @@
+--- a/hdf/test/chunks.c
++++ b/hdf/test/chunks.c
+@@ -1382,7 +1382,7 @@ test_chunks(void)
/* The following tests will work if Number type conversion
@@ -207,9 +207,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
tests these same tests with number type conversion */
/*
---- libhdf4.orig/mfhdf/dumper/hdp_vd.c
-+++ libhdf4/mfhdf/dumper/hdp_vd.c
-@@ -999,7 +999,7 @@
+--- a/mfhdf/dumper/hdp_vd.c
++++ b/mfhdf/dumper/hdp_vd.c
+@@ -999,7 +999,7 @@ dvd(dump_info_t * dumpvd_opts,
break;
default:
@@ -218,9 +218,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
ret_value = FAIL;
} /* switch for output file */
---- libhdf4.orig/mfhdf/hrepack/hrepack_an.c
-+++ libhdf4/mfhdf/hrepack/hrepack_an.c
-@@ -190,7 +190,7 @@
+--- a/mfhdf/hrepack/hrepack_an.c
++++ b/mfhdf/hrepack/hrepack_an.c
+@@ -190,7 +190,7 @@ int copy_an_data(int32 infile_id,
continue;
}
if((ann_length = ANannlen(ann_id))==FAIL) {
@@ -229,9 +229,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
continue;
}
---- libhdf4.orig/mfhdf/hrepack/hrepack_list.c
-+++ libhdf4/mfhdf/hrepack/hrepack_list.c
-@@ -432,7 +432,7 @@
+--- a/mfhdf/hrepack/hrepack_list.c
++++ b/mfhdf/hrepack/hrepack_list.c
+@@ -432,7 +432,7 @@ int list_vg(int32 infile_id,
/* Get vgroup's name */
if (Vgetnamelen(vg_id, &name_len)==FAIL)
{
@@ -240,7 +240,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
goto out;
}
vg_name = (char *) HDmalloc(sizeof(char) * (name_len+1));
-@@ -447,7 +447,7 @@
+@@ -447,7 +447,7 @@ int list_vg(int32 infile_id,
/* Get vgroup's class name */
if (Vgetclassnamelen(vg_id, &name_len)==FAIL)
{
@@ -249,7 +249,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
goto out;
}
-@@ -692,7 +692,7 @@
+@@ -692,7 +692,7 @@ int vgroup_insert(int32 infile_id,
/* Get vgroup's name */
if (Vgetnamelen(vg_id, &name_len)==FAIL)
{
@@ -258,7 +258,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
goto out;
}
vg_name = (char *) HDmalloc(sizeof(char) * (name_len+1));
-@@ -706,7 +706,7 @@
+@@ -706,7 +706,7 @@ int vgroup_insert(int32 infile_id,
/* Get vgroup's class name */
if (Vgetclassnamelen(vg_id, &name_len)==FAIL)
{
@@ -267,8 +267,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
goto out;
}
---- libhdf4.orig/mfhdf/hrepack/hrepacktst.c
-+++ libhdf4/mfhdf/hrepack/hrepacktst.c
+--- a/mfhdf/hrepack/hrepacktst.c
++++ b/mfhdf/hrepack/hrepacktst.c
@@ -73,8 +73,8 @@
*-------------------------------------------------------------------------
*/
@@ -280,7 +280,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
static int g_ncomps;
static unsigned char *g_image_data = NULL;
-@@ -122,8 +122,8 @@
+@@ -122,8 +122,8 @@ int read_data(const char* fname)
/* globals */
g_ncomps=color_planes;
@@ -291,7 +291,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
if ( g_image_data != NULL )
{
-@@ -991,8 +991,8 @@
+@@ -991,8 +991,8 @@ int add_gr_ffile(const char* name_file,
{
/* set the data type, interlace mode, and dimensions of the image */
data_type = DFNT_UINT8;
@@ -302,7 +302,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* create the raster image array */
if ((ri_id = GRcreate (gr_id, gr_name, g_ncomps, data_type, interlace_mode, dim_gr))== FAIL)
-@@ -1003,8 +1003,8 @@
+@@ -1003,8 +1003,8 @@ int add_gr_ffile(const char* name_file,
/* define the size of the data to be written */
start[0] = start[1] = 0;
@@ -313,7 +313,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* write the data in the buffer into the image array */
-@@ -1350,7 +1350,7 @@
+@@ -1350,7 +1350,7 @@ int add_r8(const char* image_file,
}
/* write the image */
@@ -322,7 +322,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
printf( "Could not write palette for image\n");
return FAIL;
}
-@@ -1425,7 +1425,7 @@
+@@ -1425,7 +1425,7 @@ int add_r24(const char* image_file,
}
/* write the image */
@@ -331,9 +331,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
printf( "Could not write image\n");
return FAIL;
}
---- libhdf4.orig/mfhdf/hrepack/hrepack_dim.c
-+++ libhdf4/mfhdf/hrepack/hrepack_dim.c
-@@ -462,7 +462,7 @@
+--- a/mfhdf/hrepack/hrepack_dim.c
++++ b/mfhdf/hrepack/hrepack_dim.c
+@@ -462,7 +462,7 @@ static int gen_dim(char* name,
/*-------------------------------------------------------------------------
@@ -342,9 +342,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
*-------------------------------------------------------------------------
*/
if ( options->trip>0 )
---- libhdf4.orig/mfhdf/hrepack/hrepack_main.c
-+++ libhdf4/mfhdf/hrepack/hrepack_main.c
-@@ -86,7 +86,7 @@
+--- a/mfhdf/hrepack/hrepack_main.c
++++ b/mfhdf/hrepack/hrepack_main.c
+@@ -86,7 +86,7 @@ int main(int argc, char **argv)
options.threshold = parse_number(argv[i+1]);
if (options.threshold==-1) {
@@ -353,9 +353,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
goto out;
}
++i;
---- libhdf4.orig/mfhdf/hrepack/hrepack_sds.c
-+++ libhdf4/mfhdf/hrepack/hrepack_sds.c
-@@ -334,7 +334,7 @@
+--- a/mfhdf/hrepack/hrepack_sds.c
++++ b/mfhdf/hrepack/hrepack_sds.c
+@@ -334,7 +334,7 @@ int copy_sds(int32 sd_in,
/*-------------------------------------------------------------------------
@@ -364,9 +364,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
*-------------------------------------------------------------------------
*/
if ( options->trip>0 )
---- libhdf4.orig/mfhdf/ncdump/ncdump.1
-+++ libhdf4/mfhdf/ncdump/ncdump.1
-@@ -97,7 +97,7 @@
+--- a/mfhdf/ncdump/ncdump.1
++++ b/mfhdf/ncdump/ncdump.1
+@@ -97,7 +97,7 @@ this name from the last component of the
by stripping off any extension it has. Use the \fB-n\fP option to specify a
different name. Although the output file name used by \fBncgen -b\fP can be
specified, it may be wise to have \fIncdump\fP change the default name to
@@ -375,9 +375,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
\fBncdump\fP, editing the resulting CDL file, and using \fBncgen -b\fP to
generate a new netCDF file from the edited CDL file.
.IP "\fB-d\fP \fIfloat_digits[,double_digits]\fP"
---- libhdf4.orig/hdf/src/herr.h
-+++ libhdf4/hdf/src/herr.h
-@@ -151,7 +151,7 @@
+--- a/hdf/src/herr.h
++++ b/hdf/src/herr.h
+@@ -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 */
@@ -386,7 +386,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* Old group interface errors */
DFE_BADGROUP, /* Error from DFdiread in opening a group */
-@@ -351,7 +351,7 @@
+@@ -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"},
@@ -395,9 +395,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* Old group interface errors */
{DFE_BADGROUP, "Error from DFdiread in opening a group"},
---- libhdf4.orig/hdf/src/hfiledd.c
-+++ libhdf4/hdf/src/hfiledd.c
-@@ -61,8 +61,8 @@
+--- a/hdf/src/hfiledd.c
++++ b/hdf/src/hfiledd.c
+@@ -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)
@@ -408,9 +408,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
LOCAL ROUTINES
HTIfind_dd - find a specific DD in the file
HTInew_dd_block - create a new (empty) DD block
---- libhdf4.orig/hdf/src/mcache.c
-+++ libhdf4/hdf/src/mcache.c
-@@ -500,7 +500,7 @@
+--- a/hdf/src/mcache.c
++++ b/hdf/src/mcache.c
+@@ -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)
@@ -419,7 +419,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
#ifdef STATISTICS
++mp->pageget;
-@@ -876,7 +876,7 @@
+@@ -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)
@@ -428,7 +428,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* Check for a page that is cached. */
if ((bp = mcache_look(mp, pgno)) != NULL)
-@@ -1172,7 +1172,7 @@
+@@ -1172,7 +1172,7 @@ mcache_look(
/* Check for attempt to look up a non-existent page. */
if (pgno > mp->npages)
@@ -437,9 +437,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
/* search through hash chain */
head = &mp->hqh[HASHKEY(pgno)];
---- libhdf4.orig/hdf/test/file.c
-+++ libhdf4/hdf/test/file.c
-@@ -161,7 +161,7 @@
+--- a/hdf/test/file.c
++++ b/hdf/test/file.c
+@@ -161,7 +161,7 @@ test_hfile(void)
ret = Hnextread(aid1, 100, DFREF_WILDCARD, DF_CURRENT);
if (ret != FAIL)
{
@@ -448,7 +448,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
__LINE__);
errors++;
}
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ test_hfile(void)
ret = Hnextread(aid1, DFTAG_WILDCARD, 3, DF_CURRENT);
if (ret != FAIL)
{
@@ -457,9 +457,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
__LINE__);
errors++;
}
---- libhdf4.orig/mfhdf/nctest/atttests.c
-+++ libhdf4/mfhdf/nctest/atttests.c
-@@ -593,7 +593,7 @@
+--- a/mfhdf/nctest/atttests.c
++++ b/mfhdf/nctest/atttests.c
+@@ -593,7 +593,7 @@ test_ncattget(path)
}
/* try getting non-existent attribute, should fail */
if (ncattget(cdfid, uu_id, "nonesuch", vmax.val) != -1) {
@@ -468,9 +468,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
ncclose(cdfid); return;
}
if (ncclose (cdfid) == -1) {
---- libhdf4.orig/mfhdf/test/hdftest.c
-+++ libhdf4/mfhdf/test/hdftest.c
-@@ -444,7 +444,7 @@
+--- a/mfhdf/test/hdftest.c
++++ b/mfhdf/test/hdftest.c
+@@ -444,7 +444,7 @@ main(int argc, char *argv[])
status = SDfindattr(newsds, "blarf");
if(status != FAIL)
{
@@ -479,9 +479,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
num_errs++;
}
---- libhdf4.orig/hdf/util/hdf8to24.c
-+++ libhdf4/hdf/util/hdf8to24.c
-@@ -266,7 +266,7 @@
+--- a/hdf/util/hdf8to24.c
++++ b/hdf/util/hdf8to24.c
+@@ -266,7 +266,7 @@ main(int argc, char *argv[])
} /* end if */
} /* end if */
else
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,4 @@
+---
+Name: HDF4
+Repository: https://bitbucket.hdfgroup.org/scm/hdffr/hdf4.git
+Repository-Browse: https://bitbucket.hdfgroup.org/projects/HDFFR/repos/hdf4/browse
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/compare/caa19ecff6fc879fc9d3b42b5f7cd6260f8ec3cf...6cabfc255593b9cace92338970394a337ed3ed0b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/compare/caa19ecff6fc879fc9d3b42b5f7cd6260f8ec3cf...6cabfc255593b9cace92338970394a337ed3ed0b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190316/1ead8bc6/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list