This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch experimental in repository hdf4.
commit fff3113fb5d53d37c83bd04677b00939822039a8 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Mon Mar 2 22:02:01 2015 +0100 use d/format 3.0 quilt for patches --- debian/patches/64bit | 6 +++--- debian/patches/config-updates.diff | 12 ++++++------ debian/patches/hdf-4.2.10-aarch64.patch | 12 ++++++------ debian/patches/hdfi.h | 12 ++++++------ debian/patches/install-examples.diff | 20 ++++++++++---------- debian/patches/kfreebsd | 12 ++++++------ debian/patches/man | 6 +++--- debian/patches/missing-includes.diff | 8 ++++---- debian/patches/ppc64el.diff | 18 +++++++++--------- debian/source/format | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/debian/patches/64bit b/debian/patches/64bit index 80af0d5..49fc5ea 100644 --- a/debian/patches/64bit +++ b/debian/patches/64bit @@ -1,7 +1,7 @@ -Index: b/HDF4/mfhdf/libsrc/netcdf.h.in +Index: b/mfhdf/libsrc/netcdf.h.in =================================================================== ---- a/HDF4/mfhdf/libsrc/netcdf.h.in -+++ b/HDF4/mfhdf/libsrc/netcdf.h.in +--- a/mfhdf/libsrc/netcdf.h.in ++++ b/mfhdf/libsrc/netcdf.h.in @@ -293,7 +293,7 @@ /* * Variables/attributes of type NC_LONG should use the C type 'nclong' diff --git a/debian/patches/config-updates.diff b/debian/patches/config-updates.diff index 287b20c..a1c1d9a 100644 --- a/debian/patches/config-updates.diff +++ b/debian/patches/config-updates.diff @@ -1,7 +1,7 @@ -Index: b/HDF4/bin/config.guess +Index: b/bin/config.guess =================================================================== ---- a/HDF4/bin/config.guess -+++ b/HDF4/bin/config.guess +--- a/bin/config.guess ++++ b/bin/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -998,10 +998,10 @@ Index: b/HDF4/bin/config.guess #endif #endif -Index: b/HDF4/bin/config.sub +Index: b/bin/config.sub =================================================================== ---- a/HDF4/bin/config.sub -+++ b/HDF4/bin/config.sub +--- a/bin/config.sub ++++ b/bin/config.sub @@ -1,44 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. diff --git a/debian/patches/hdf-4.2.10-aarch64.patch b/debian/patches/hdf-4.2.10-aarch64.patch index a9c107c..b80c4ef 100644 --- a/debian/patches/hdf-4.2.10-aarch64.patch +++ b/debian/patches/hdf-4.2.10-aarch64.patch @@ -1,10 +1,10 @@ Author: Marcin Juswkiewicz Origin: https://bugs.launchpad.net/ubuntu/+source/libhdf4/+bug/1296303 Description: Add Aarch64 support -only part of the original patch -Index: hdf-4.2.10/HDF4/mfhdf/ncgen/ncgen.l +Index: hdf-4.2.10/mfhdf/ncgen/ncgen.l =================================================================== ---- hdf-4.2.10.orig/HDF4/mfhdf/ncgen/ncgen.l -+++ hdf-4.2.10/HDF4/mfhdf/ncgen/ncgen.l +--- hdf-4.2.10.orig/mfhdf/ncgen/ncgen.l ++++ hdf-4.2.10/mfhdf/ncgen/ncgen.l @@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss yyerror(errstr); } @@ -14,10 +14,10 @@ Index: hdf-4.2.10/HDF4/mfhdf/ncgen/ncgen.l if (dd < INT_MIN || dd > INT_MAX) #else if (dd < LONG_MIN || dd > LONG_MAX) -Index: hdf-4.2.10/HDF4/mfhdf/ncgen/ncgenyy.c +Index: hdf-4.2.10/mfhdf/ncgen/ncgenyy.c =================================================================== ---- hdf-4.2.10.orig/HDF4/mfhdf/ncgen/ncgenyy.c -+++ hdf-4.2.10/HDF4/mfhdf/ncgen/ncgenyy.c +--- hdf-4.2.10.orig/mfhdf/ncgen/ncgenyy.c ++++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c @@ -989,7 +989,7 @@ YY_RULE_SETUP yyerror(errstr); } diff --git a/debian/patches/hdfi.h b/debian/patches/hdfi.h index 9dac696..dad58ce 100644 --- a/debian/patches/hdfi.h +++ b/debian/patches/hdfi.h @@ -1,7 +1,7 @@ -Index: b/HDF4/hdf/src/hdfi.h +Index: b/hdf/src/hdfi.h =================================================================== ---- a/HDF4/hdf/src/hdfi.h -+++ b/HDF4/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) */ @@ -563,10 +563,10 @@ Index: b/HDF4/hdf/src/hdfi.h #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 -Index: b/HDF4/hdf/src/hconv.h +Index: b/hdf/src/hconv.h =================================================================== ---- a/HDF4/hdf/src/hconv.h -+++ b/HDF4/hdf/src/hconv.h +--- a/hdf/src/hconv.h ++++ b/hdf/src/hconv.h @@ -59,7 +59,7 @@ /* CONSTANT DEFINITIONS */ /*****************************************************************************/ diff --git a/debian/patches/install-examples.diff b/debian/patches/install-examples.diff index fe4184d..e33dd76 100644 --- a/debian/patches/install-examples.diff +++ b/debian/patches/install-examples.diff @@ -1,5 +1,5 @@ ---- a/HDF4/config/examples.am -+++ b/HDF4/config/examples.am +--- a/config/examples.am ++++ b/config/examples.am @@ -44,7 +44,7 @@ CLEANFILES=$(EXAMPLE_PROG) @@ -44,8 +44,8 @@ fi; \ done ---- a/HDF4/hdf/examples/Makefile.in -+++ b/HDF4/hdf/examples/Makefile.in +--- a/hdf/examples/Makefile.in ++++ b/hdf/examples/Makefile.in @@ -559,7 +559,7 @@ AN_read_annotation: $(srcdir)/AN_read_annotation.c @@ -90,8 +90,8 @@ fi; \ done ---- a/HDF4/hdf/fortran/examples/Makefile.in -+++ b/HDF4/hdf/fortran/examples/Makefile.in +--- a/hdf/fortran/examples/Makefile.in ++++ b/hdf/fortran/examples/Makefile.in @@ -551,7 +551,7 @@ AN_read_annotation: $(srcdir)/AN_read_annotation.f @@ -136,8 +136,8 @@ fi; \ done ---- a/HDF4/mfhdf/examples/Makefile.in -+++ b/HDF4/mfhdf/examples/Makefile.in +--- a/mfhdf/examples/Makefile.in ++++ b/mfhdf/examples/Makefile.in @@ -523,7 +523,7 @@ chunking_example: $(srcdir)/SD_chunking_example.c @@ -182,8 +182,8 @@ fi; \ done ---- a/HDF4/mfhdf/fortran/examples/Makefile.in -+++ b/HDF4/mfhdf/fortran/examples/Makefile.in +--- a/mfhdf/fortran/examples/Makefile.in ++++ b/mfhdf/fortran/examples/Makefile.in @@ -524,7 +524,7 @@ SD_chunking_example: $(srcdir)/SD_chunking_example.f diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd index 5968183..4982b20 100644 --- a/debian/patches/kfreebsd +++ b/debian/patches/kfreebsd @@ -1,7 +1,7 @@ -Index: b/HDF4/configure.ac +Index: b/configure.ac =================================================================== ---- a/HDF4/configure.ac -+++ b/HDF4/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -801,7 +801,7 @@ ## These header files should probably be generated by autoconf instead ## of being copied depending upon the host. @@ -11,10 +11,10 @@ Index: b/HDF4/configure.ac *-freebsd*) BAR="fbsd" ;; *-ibm-aix*) BAR="aix" ;; sparc64-*-solaris2*) BAR="solaris64" ;; -Index: b/HDF4/hdf/src/hdfi.h +Index: b/hdf/src/hdfi.h =================================================================== ---- a/HDF4/hdf/src/hdfi.h 2014-09-13 23:09:17.689485898 +0200 -+++ b/HDF4/hdf/src/hdfi.h 2014-09-13 23:10:32.453487107 +0200 +--- a/hdf/src/hdfi.h 2014-09-13 23:09:17.689485898 +0200 ++++ b/hdf/src/hdfi.h 2014-09-13 23:10:32.453487107 +0200 @@ -1392,7 +1392,7 @@ /*-----------------------------------------------------*/ #endif /*power PC 5 64 */ diff --git a/debian/patches/man b/debian/patches/man index 0f873a2..3d41948 100644 --- a/debian/patches/man +++ b/debian/patches/man @@ -1,7 +1,7 @@ -Index: b/HDF4/man/hdf.1 +Index: b/man/hdf.1 =================================================================== ---- a/HDF4/man/hdf.1 -+++ b/HDF4/man/hdf.1 +--- a/man/hdf.1 ++++ b/man/hdf.1 @@ -6,9 +6,7 @@ .ft B -lmfhdf -ldf -ljpeg -lz [ -lsz ] diff --git a/debian/patches/missing-includes.diff b/debian/patches/missing-includes.diff index ab25dbb..51a5682 100644 --- a/debian/patches/missing-includes.diff +++ b/debian/patches/missing-includes.diff @@ -1,5 +1,5 @@ ---- a/HDF4/hdf/util/hdf2gif.c -+++ b/HDF4/hdf/util/hdf2gif.c +--- a/hdf/util/hdf2gif.c ++++ b/hdf/util/hdf2gif.c @@ -13,6 +13,7 @@ #include "gif.h" @@ -8,8 +8,8 @@ #define HDFNAME "laser.hdf" #define VGROUPCLASS "RIG0.0" ---- a/HDF4/mfhdf/nctest/driver.c -+++ b/HDF4/mfhdf/nctest/driver.c +--- a/mfhdf/nctest/driver.c ++++ b/mfhdf/nctest/driver.c @@ -29,6 +29,7 @@ #endif diff --git a/debian/patches/ppc64el.diff b/debian/patches/ppc64el.diff index 5dea3ff..b27af79 100644 --- a/debian/patches/ppc64el.diff +++ b/debian/patches/ppc64el.diff @@ -1,7 +1,7 @@ -Index: b/HDF4/configure +Index: b/configure =================================================================== ---- a/HDF4/configure -+++ b/HDF4/configure +--- a/configure ++++ b/configure @@ -8648,7 +8648,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" @@ -26,10 +26,10 @@ Index: b/HDF4/configure LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) -Index: b/HDF4/aclocal.m4 +Index: b/aclocal.m4 =================================================================== ---- a/HDF4/aclocal.m4 -+++ b/HDF4/aclocal.m4 +--- a/aclocal.m4 ++++ b/aclocal.m4 @@ -2300,7 +2300,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" @@ -54,10 +54,10 @@ Index: b/HDF4/aclocal.m4 LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) -Index: b/HDF4/m4/libtool.m4 +Index: b/m4/libtool.m4 =================================================================== ---- a/HDF4/m4/libtool.m4 -+++ b/HDF4/m4/libtool.m4 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- 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