This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository hdf4.
commit 0b0a2ac9c78401d9dbbfe9ef659d6f38377fc54b Merge: ae8bc0c 0f0c52e Author: Bas Couwenberg <[email protected]> Date: Fri May 20 18:12:40 2016 +0200 Merge branch 'experimental' Conflicts: debian/changelog debian/control.in debian/patches/series debian/rules CMakeFilters.cmake | 266 +- CMakeInstallation.cmake | 462 +- CMakeLists.txt | 702 +- COPYING | 2 +- CTestConfig.cmake | 34 +- MANIFEST | 52 +- Makefile.in | 235 +- README.txt | 2 +- UserMacros.cmake | 8 +- aclocal.m4 | 411 +- bin/cmakehdf4 | 25 +- bin/reconfigure | 12 +- bin/release | 149 +- bin/test-driver | 139 + config/cmake/CTestCustom.cmake | 6 +- config/cmake/CheckTypeSize.cmake | 48 - config/cmake/ConfigureChecks.cmake | 369 +- config/cmake/FindHDF4.cmake.in | 18 +- config/cmake/FindMPI.cmake | 628 - config/cmake/FindSZIP.cmake | 179 - config/cmake/HDF4Macros.cmake | 37 +- config/cmake/HDF4UseFortran.cmake | 72 +- config/cmake/HDF4_Examples.cmake.in | 48 +- config/cmake/HDFLibMacros.cmake | 350 - config/cmake/HDFMacros.cmake | 187 - config/cmake/NSIS.InstallOptions.ini.in | 4 +- config/cmake/PkgInfo.in | 1 + config/cmake/README.txt.cmake.in | 60 + config/cmake/UserMacros/Windows_MT.cmake | 34 +- config/cmake/cacheinit.cmake | 64 +- config/cmake/h4config.h.in | 4 +- config/cmake/hdf.gif | Bin 1016 -> 0 bytes config/cmake/hdf4-config-version.cmake.in | 22 +- config/cmake/hdf4-config.cmake.build.in | 70 +- config/cmake/hdf4-config.cmake.install.in | 86 +- config/cmake/libhdf4.settings.cmake.in | 2 +- config/cmake/mccacheinit.cmake | 67 +- config/cmake/runTest.cmake | 182 - .../{cmake => cmake_ext_mod}/CPack.Info.plist.in | 0 config/cmake_ext_mod/CTestCustom.cmake | 16 + config/cmake_ext_mod/CheckTypeSize.cmake | 50 + config/cmake_ext_mod/ConfigureChecks.cmake | 751 + config/cmake_ext_mod/FindSZIP.cmake | 179 + config/cmake_ext_mod/GetTimeOfDayTest.cpp | 15 + config/cmake_ext_mod/HDFCXXTests.cpp | 56 + config/cmake_ext_mod/HDFLibMacros.cmake | 249 + config/cmake_ext_mod/HDFMacros.cmake | 288 + config/{cmake => cmake_ext_mod}/HDFTests.c | 34 +- config/cmake_ext_mod/HDFUseFortran.cmake | 167 + .../NSIS.InstallOptions.ini.in | 2 +- config/{cmake => cmake_ext_mod}/NSIS.template.in | 0 config/cmake_ext_mod/grepTest.cmake | 64 + config/cmake_ext_mod/hdf.bmp | Bin 0 -> 1254 bytes config/cmake_ext_mod/hdf.icns | Bin 0 -> 326012 bytes config/cmake_ext_mod/hdf.ico | Bin 0 -> 23558 bytes config/cmake_ext_mod/prunTest.cmake | 145 + config/cmake_ext_mod/runTest.cmake | 207 + config/cmake_ext_mod/version.plist.in | 17 + configure | 213 +- configure.ac | 29 +- debian/HDF42r4-UG-html.tar.gz.uue | 45217 ------------------- debian/RefMan42r4-html.tar.gz.uue | 5171 --- debian/UG_Examples.tar.gz.uue | 7985 ---- debian/autoreconf | 2 + debian/autoreconf.in | 2 + debian/changelog | 52 +- debian/control | 28 +- debian/control.in | 48 +- debian/copyright | 461 +- debian/docbase-ref | 13 - debian/docbase-user | 20 - debian/gbp.conf | 16 + debian/hdf4-tools.lintian-overrides | 3 + debian/libhdf4-0-alt.symbols | 988 + debian/libhdf4-0.symbols | 1626 + debian/libhdf4-alt-dev.install | 11 +- debian/libhdf4-dev.install | 3 +- debian/libhdf4-doc.examples | 1 - debian/libhdf4-doc.install | 5 +- debian/libhdf4-doc.install.in | 1 + debian/patches/64bit | 11 +- debian/patches/autotools | 55 +- debian/patches/config | 15 +- debian/patches/config-updates.diff | 1736 - debian/patches/enablesharedfortran.diff | 31 + debian/patches/fix_string_literals.diff | 566 - debian/patches/fmpool | 21 +- debian/patches/hdf-4.2.10-aarch64.patch | 15 +- debian/patches/hdfi.h | 35 +- debian/patches/install-examples.diff | 43 +- debian/patches/kfreebsd | 19 +- debian/patches/man | 13 +- debian/patches/manpage-has-errors-from-man.patch | 15 + debian/patches/mips64.diff | 23 + debian/patches/missing-includes.diff | 17 +- debian/patches/ppc64el.diff | 33 +- debian/patches/ppc64el.patch | 13 +- debian/patches/rename_hdf_hdfalt | 118 + debian/patches/series | 5 +- debian/patches/shared_fortran | 21 +- debian/patches/spelling-errors.patch | 480 + debian/rules | 310 +- debian/source/format | 2 +- debian/watch | 6 +- hdf/CMakeLists.txt | 12 +- hdf/Makefile.in | 208 +- hdf/examples/CMakeLists.txt | 16 +- hdf/examples/CMakeTests.cmake | 46 +- hdf/examples/Makefile.in | 662 +- hdf/examples/README | 11 +- hdf/fortran/CMakeLists.txt | 60 +- hdf/fortran/CMakeTests.cmake | 48 +- hdf/fortran/Makefile.in | 208 +- hdf/fortran/examples/CMakeLists.txt | 44 +- hdf/fortran/examples/CMakeTests.cmake | 52 +- hdf/fortran/examples/GR_get_attribute.f | 1 + hdf/fortran/examples/GR_image_info.f | 1 + hdf/fortran/examples/Makefile.in | 627 +- hdf/fortran/examples/VD_get_vdata_info.f | 25 +- hdf/fortran/examples/VG_set_get_vgroup_attr.f | 1 + hdf/src/CMakeLists.txt | 24 +- hdf/src/H4api_adpt.h | 59 +- hdf/src/Makefile.in | 241 +- hdf/src/atom.c | 14 +- hdf/src/bitvect.c | 11 +- hdf/src/hfile.h | 6 +- hdf/src/mfgr.c | 18 +- hdf/src/vgint.h | 5 +- hdf/test/CMakeLists.txt | 18 +- hdf/test/CMakeTests.cmake | 90 +- hdf/test/Makefile.in | 626 +- hdf/test/tvsetf.f | 14 +- hdf/util/CMakeLists.txt | 70 +- hdf/util/CMakeTests.cmake | 318 +- hdf/util/Makefile.in | 711 +- hdf/util/fp2hdf.c | 66 +- hdf/util/h4cc.in | 17 +- hdf/util/h4fc.in | 0 hdf/util/h4redeploy.in | 0 hdf/util/hdf2gif.c | 4 +- hdf/util/hdfrseq.c | 706 - hdf/util/testutil.sh.in | 0 hdf/util/vcompat.c | 43 - hdf/util/writehdf.c | 24 +- man/Makefile.in | 120 +- man/hdf.1 | 6 +- mfhdf/CMakeLists.txt | 36 +- mfhdf/Makefile.in | 209 +- mfhdf/dumper/CMakeLists.txt | 36 +- mfhdf/dumper/CMakeTests.cmake | 84 +- mfhdf/dumper/Makefile.am | 4 +- mfhdf/dumper/Makefile.in | 592 +- mfhdf/dumper/hdp.c | 37 +- mfhdf/dumper/hdp_util.c | 12 +- mfhdf/dumper/hdp_vg.c | 32 +- mfhdf/dumper/testhdp.sh.in | 2 +- mfhdf/examples/CMakeLists.txt | 22 +- mfhdf/examples/CMakeTests.cmake | 24 +- mfhdf/examples/Makefile.in | 571 +- mfhdf/examples/testexamples.sh.in | 0 mfhdf/fortran/CMakeLists.txt | 112 +- mfhdf/fortran/CMakeTests.cmake | 90 +- mfhdf/fortran/Makefile.am | 4 +- mfhdf/fortran/Makefile.in | 600 +- mfhdf/fortran/examples/CMakeLists.txt | 42 +- mfhdf/fortran/examples/CMakeTests.cmake | 30 +- mfhdf/fortran/examples/Makefile.in | 571 +- mfhdf/fortran/testfortran.sh.in | 0 mfhdf/hdfimport/CMakeLists.txt | 42 +- mfhdf/hdfimport/CMakeTests.cmake | 176 +- mfhdf/hdfimport/Makefile.am | 4 +- mfhdf/hdfimport/Makefile.in | 604 +- mfhdf/hdfimport/hdfimport.c | 142 +- mfhdf/hdfimport/testutil.sh.in | 0 mfhdf/hdiff/CMakeLists.txt | 30 +- mfhdf/hdiff/CMakeTests.cmake | 98 +- mfhdf/hdiff/Makefile.am | 4 +- mfhdf/hdiff/Makefile.in | 584 +- mfhdf/hdiff/hdiff.h | 4 +- mfhdf/hdiff/testhdiff.sh.in | 0 mfhdf/hrepack/CMakeLists.txt | 47 +- mfhdf/hrepack/CMakeTests.cmake | 338 +- mfhdf/hrepack/Makefile.am | 26 +- mfhdf/hrepack/Makefile.in | 821 +- mfhdf/hrepack/hrepack.c | 1 + mfhdf/hrepack/hrepack.h | 17 +- mfhdf/hrepack/hrepack.sh.in | 357 + mfhdf/hrepack/hrepack_all.sh.in | 0 mfhdf/hrepack/hrepack_check_help.txt | 3 + mfhdf/hrepack/hrepack_help.txt | 55 + mfhdf/hrepack/hrepack_list.c | 57 +- mfhdf/hrepack/hrepacktst.c | 392 +- mfhdf/libsrc/CMakeLists.txt | 72 +- mfhdf/libsrc/Makefile.am | 4 +- mfhdf/libsrc/Makefile.in | 265 +- mfhdf/libsrc/local_nc.h | 4 +- mfhdf/libsrc/xdrposix.c | 8 +- mfhdf/ncdump/CMakeLists.txt | 36 +- mfhdf/ncdump/CMakeTests.cmake | 49 +- mfhdf/ncdump/Makefile.am | 4 +- mfhdf/ncdump/Makefile.in | 580 +- mfhdf/ncdump/ncdump.c | 18 +- mfhdf/ncdump/ncdump.h | 4 +- mfhdf/ncdump/testncdump.sh.in | 0 mfhdf/ncdump/vardata.c | 38 +- mfhdf/ncgen/CMakeLists.txt | 40 +- mfhdf/ncgen/CMakeTests.cmake | 65 +- mfhdf/ncgen/Makefile.am | 4 +- mfhdf/ncgen/Makefile.in | 587 +- mfhdf/ncgen/main.c | 15 +- mfhdf/ncgen/testncgen.sh.in | 0 mfhdf/nctest/CMakeLists.txt | 43 +- mfhdf/nctest/CMakeTests.cmake | 6 +- mfhdf/nctest/Makefile.am | 4 +- mfhdf/nctest/Makefile.in | 578 +- mfhdf/nctest/driver.c | 3 +- mfhdf/nctest/val.c | 8 +- mfhdf/test/CMakeLists.txt | 84 +- mfhdf/test/CMakeTests.cmake | 56 +- mfhdf/test/Makefile.am | 4 +- mfhdf/test/Makefile.in | 598 +- mfhdf/test/tdatainfo.c | 2 +- mfhdf/test/testmfhdf.sh.in | 0 mfhdf/xdr/CMakeLists.txt | 30 +- mfhdf/xdr/Makefile.am | 2 +- mfhdf/xdr/Makefile.in | 550 +- mfhdf/xdr/xdrstdio.c | 4 +- release_notes/HISTORY.txt | 302 + release_notes/INSTALL | 2 +- release_notes/INSTALL_CMake.txt | 1027 +- release_notes/INSTALL_CYGWIN.txt | 17 +- release_notes/RELEASE.txt | 314 +- release_notes/USING_CMake_Examples.txt | 91 +- release_notes/USING_HDF4_CMake.txt | 164 +- release_notes/USING_HDF4_VS.txt | 30 +- 235 files changed, 20558 insertions(+), 70074 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
