[netcdf] 01/01: Merge branch 'upstream'
This is an automated email from the git hooks/post-receive script. nschloe-guest pushed a commit to branch master in repository netcdf. commit 3d5ea5c12cc2215b5bed40a3648e43529bff85a1 Merge: 99f5706 620eaff Author: Nico Schlömer Date: Thu Mar 5 19:16:06 2015 +0100 Merge branch 'upstream' .gitignore | 14 +- .travis.yml | 23 + BRANCH-STATUS|5 - CMakeLists.txt | 65 +- CTestConfig.cmake.in |3 +- Doxyfile.developer |2 +- Makefile.in | 47 +- README.md|8 +- RELEASE_NOTES.md | 22 +- aclocal.m4 | 181 +- configure => autom4te.cache/output.0 | 4158 -- configure => autom4te.cache/output.1 | 4158 -- configure => autom4te.cache/output.2 | 4158 -- autom4te.cache/requests | 576 autom4te.cache/traces.0 | 3688 +++ autom4te.cache/traces.1 | 1676 +++ autom4te.cache/traces.2 | 3688 +++ cf |2 +- compile |2 +- config.guess | 201 +- config.h.in |7 +- config.sub | 40 +- configure| 2026 ++--- configure.ac |4 +- depcomp |2 +- docs/Makefile.in | 23 +- docs/building-with-cmake.md | 106 - docs/footer.html |3 - docs/images/Makefile.in | 22 +- docs/netcdf.m4 |8 +- docs/windows-binaries.md | 69 + examples/C/Makefile.in | 26 +- examples/CDL/Makefile.in | 25 +- examples/Makefile.in | 22 +- h5_test/Makefile.in | 29 +- include/Makefile.in | 25 +- include/nc4internal.h|2 +- install-sh | 366 +-- libdap2/Makefile.in | 26 +- libdap2/cdf.c| 66 +- libdap2/constraints.c| 57 +- libdap2/daputil.c| 35 +- libdap2/getvara.c| 106 +- libdap2/nccommon.h |4 +- libdap2/ncd2dispatch.c | 14 +- libdap2/ncdap.h |4 +- libdispatch/Makefile.in | 26 +- liblib/Makefile.in | 26 +- libncdap.tar.gz | Bin 316361 -> 0 bytes libsrc/Makefile.in | 26 +- libsrc/attr.c| 363 +-- libsrc/attr.m4 | 24 +- libsrc4/Makefile.in | 26 +- libsrc4/nc4attr.c|6 +- libsrc4/nc4file.c| 48 +- libsrc4/nc4hdf.c | 24 +- libsrc4/nc4internal.c|4 +- libsrc5/Makefile.in | 26 +- ltmain.sh| 5471 +- m4/libtool.m4| 2381 +++ m4/ltoptions.m4 | 127 +- m4/ltsugar.m4|7 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4|7 +- missing |2 +- nc-config.cmake.in |8 +- nc_test/CMakeLists.txt |2 +- nc_test/Makefile.in | 29 +- nc_test/run_diskless2.sh |4 +- nc_test4/Makefile.in | 29 +- nc_test4/run_grp_rename.sh | 12 +- nc_test4/tst_rename.c| 80 + ncdap_test/CMakeLists.txt| 15 + ncdap_test/Makefile.in | 29 +- ncdap_test/expected3/Makefile.in | 22 +- ncdap_test/expected4/Makefile.in | 22 +- ncdap_test/expectremote3/Makefile.in | 22 +- ncdap_test/expectremote4/Makefile.in | 22 +- ncdap_test/testdata3/Makefile.in | 22 +- ncdap_test/tst_formatx.sh|2 +- ncdap_test/tst_ncdap3.sh |9 +- ncdump/CMakeLists.txt| 83 +- ncdump/Makefile.am |7 +- ncdump/Makefile.in | 70 +- ncdump/cdl/Makefile.in | 22 +- ncdump/dumplib.c | 130 +- ncdump/expected/Makefile.in | 22 +- ncdump/nccopy.1 | 78 +- ncdump/ncdump.1 | 40 +- ncdump/run_back_comp_tests.sh|5 + ncdump/tst_bug324.c | 97 + ncdump/tst_formatx3.sh |4 +- ncdump/tst_formatx4.sh |4 +- ncdump/tst_lengths.sh| 75 +
[netcdf] 01/01: Merge branch 'upstream' into split-c-f-cxx
This is an automated email from the git hooks/post-receive script. nschloe-guest pushed a commit to branch split-c-f-cxx in repository netcdf. commit 909ed37ce79698894a5ca7e28212a7cf6a9e3c80 Merge: 1d01119 ed39029 Author: Nico Schlömer Date: Thu Jan 15 01:07:38 2015 +0100 Merge branch 'upstream' into split-c-f-cxx BRANCH-STATUS | 5 + CMakeInstallation.cmake| 130 + CMakeLists.txt | 910 +- COPYRIGHT | 4 - CTestConfig.cmake |17 - CTestConfig.cmake.in | 2 +- Doxyfile | 1934 --- docs/Doxyfile.guide.in => Doxyfile.developer | 322 +- Make0 |35 +- Makefile.am|53 +- Makefile.in| 1177 ++ PostInstall.cmake | 1 + README.md | 8 +- RELEASE_NOTES.md | 128 +- aclocal.m4 | 1194 ++ cf |30 +- cf.cmake |14 + compile| 347 + config.guess | 1421 +++ config.h.cmake.in |18 +- config.h.in| 516 + config.sub | 1807 +++ configure | 12627 +-- configure.ac | 164 +- depcomp| 791 ++ docs/CMakeLists.txt|85 +- COPYRIGHT => docs/COPYRIGHT.dox|11 +- docs/Doxyfile.in | 177 +- docs/Doxyfile.tutorial.in | 2344 docs/DoxygenLayout.xml |12 +- docs/FAQ.md| 1952 +++ docs/Makefile.am |11 +- docs/Makefile.in | 726 ++ docs/all-error-codes.md| 117 +- docs/building-with-cmake.md| 2 +- docs/cdl.dox |44 +- docs/cmake_faq.md | 4 - docs/credits.md| 120 + docs/docmap.pdf| Bin 0 -> 64347 bytes docs/errors.dox.old|51 - docs/guide.dox | 310 +- docs/images/InstallTreeWindows.jpg | Bin 61966 -> 0 bytes docs/images/InstallTreeWindows.png | Bin 291971 -> 44671 bytes docs/images/Makefile.am| 2 +- docs/images/Makefile.in| 487 + docs/install-fortran.md|47 + docs/install.dox |18 +- docs/install.md|54 +- docs/internal.dox |26 +- docs/mainpage.dox |25 +- docs/notes.dox |37 +- docs/tutorial.dox |86 +- docs/types.dox |22 +- docs/windows-binaries.md |52 +- examples/C/Makefile.in | 1207 ++ examples/CDL/Makefile.in | 883 ++ examples/Makefile.in | 675 + h5_test/CMakeLists.txt | 6 +- h5_test/Makefile.in| 1499 +++ include/.gitignore | 1 + include/Makefile.am|11 +- include/Makefile.in| 625 + include/nc4internal.h |11 +- include/ncconfigure.h |20 +- include/ncdispatch.h | 4 +- include/nctime.h | 4 +- include/netcdf.h | 440 +- include/netcdf_meta.h.in |52 + install-sh | 501 + libdap2/Make0 | 2 +- libdap2/Makefile.in| 855 ++ libdap2/cache.c|45 +- libdap2/cdf.c |41 +- libdap2/constraint
[netcdf] 01/01: Merge branch 'upstream' into split-c-f-cxx
This is an automated email from the git hooks/post-receive script.
nschloe-guest pushed a commit to branch split-c-f-cxx
in repository netcdf.
commit 106649f0b03cb51b9a7fc6ca958eee2685228421
Merge: 5133877 1339ba2
Author: Nico Schlömer
Date: Thu May 22 01:03:39 2014 +0200
Merge branch 'upstream' into split-c-f-cxx
CMakeLists.txt| 46 +-
Doxyfile |2 +-
Makefile.am |6 +-
RELEASE_NOTES.md |4 +
autom4te.cache/output.0 | 9959 -
autom4te.cache/requests | 77 -
autom4te.cache/traces.0 | 939 ---
configure | 9959 -
configure.ac | 10 +-
docs/CMakeLists.txt | 76 +
{man4 => docs}/Doxyfile.guide.in | 34 +-
{man4 => docs}/Doxyfile.in| 58 +-
{man4 => docs}/Doxyfile.tutorial.in | 34 +-
{man4 => docs}/DoxygenLayout.xml |0
{man4 => docs}/Makefile.am|8 +-
{man4 => docs}/all-error-codes.md |0
{man4 => docs}/architecture.dox |0
{man4 => docs}/building-with-cmake.md |0
{man4 => docs}/cdl.dox|2 +-
{man4 => docs}/cmake_faq.md |2 +-
{man4 => docs}/dispatch.dox |0
{man4 => docs}/errors.dox.old |2 +-
{man4 => docs}/esg.html |2 +-
{man4 => docs}/footer.html|0
{man4 => docs}/groups.dox |0
{man4 => docs}/guide.dox |0
{man4 => docs}/header.html|0
{man4 => docs}/images/InstallTreeWindows.jpg | Bin
{man4 => docs}/images/InstallTreeWindows.png | Bin
{man4 => docs}/images/Makefile.am |0
{man4 => docs}/images/aqua.jpg| Bin
{man4 => docs}/images/chunking2.png | Bin
{man4 => docs}/images/compatibility3.png | Bin
{man4 => docs}/images/compression.png | Bin
{man4 => docs}/images/deptree.jpg | Bin
{man4 => docs}/images/groups.png | Bin
{man4 => docs}/images/nc-classic-uml.png | Bin
{man4 => docs}/images/nc4-model.png | Bin
{man4 => docs}/images/ncatts.png | Bin
{man4 => docs}/images/nccoords.png| Bin
{man4 => docs}/images/ncfile.png | Bin
{man4 => docs}/images/netcdf_architecture.odg | Bin
{man4 => docs}/images/netcdf_architecture.png | Bin
{man4 => docs}/images/pnetcdf.png | Bin
{man4 => docs}/images/terra.jpg | Bin
{man4 => docs}/install-fortran.md |0
{man4 => docs}/install.dox|0
{man4 => docs}/install.md |0
{man4 => docs}/internal.dox |0
{man4 => docs}/mainpage.dox |0
{man4 => docs}/netcdf-50x50.png | Bin
{man4 => docs}/netcdf.m4 |0
{man4 => docs}/notes.dox |0
{man4 => docs}/old/defines.texi |0
{man4 => docs}/old/netcdf-c.texi |0
{man4 => docs}/old/netcdf-cxx.texi|0
{man4 => docs}/old/netcdf-cxx4.texi |0
{man4 => docs}/old/netcdf-f77.texi|0
{man4 => docs}/old/netcdf-f90.texi|0
{man4 => docs}/old/netcdf-install.texi|0
{man4 => docs}/old/netcdf-internal.texi |0
{man4 => docs}/old/netcdf-tutorial.texi |0
{man4 => docs}/old/netcdf.texi|0
{man4 => docs}/tutorial.dox |0
{man4 => docs}/types.dox |0
{man4 => docs}/unidata_logo_cmyk.png | Bin
{man4 => docs}/windows-binaries.md|0
libsrc/CMakeLists.txt |2 +-
libsrc/Makefile.am|2 +-
man4/CMakeLists.txt | 70 -
70 files changed, 185 insertions(+), 21109 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.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
