[libdap] 10/22: Merge tag 'upstream/3.18.1' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Nov 4 15:20:53 UTC 2016


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository libdap.

commit 317e3c810522cc237235cfe9108b1844e2696681
Merge: 1a70d37 6402103
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Sep 29 18:09:12 2016 +0100

    Merge tag 'upstream/3.18.1' into debian/master

 AISConnect.cc                                      |    87 -
 AISConnect.h                                       |    71 -
 AISDatabaseParser.cc                               |   436 -
 AISDatabaseParser.h                                |   133 -
 AISExceptions.h                                    |    69 -
 AISMerge.cc                                        |   117 -
 AISMerge.h                                         |    93 -
 AISResources.cc                                    |   272 -
 AISResources.h                                     |   148 -
 D4ParseError.h                                     |    47 -
 DAPCache3.cc                                       |  1003 -
 DAPCache3.h                                        |   160 -
 DEBIAN/control                                     |    14 -
 DEBIAN/videbcontrol.sh                             |    43 -
 Error.tab.cc                                       |  1552 +
 Error.tab.hh                                       |   115 +
 INSTALL                                            |    13 +-
 INSTALL.AIX                                        |   110 -
 Makefile.in                                        |  2812 ++
 README.AIS                                         |   106 -
 Removed_functions.txt                              |   277 -
 XDRStreamMarshaller.cc                             |     5 +-
 aclocal.m4                                         |  1066 +
 build-deb-pkg.sh                                   |    45 -
 ce_expr.tab.cc                                     |  2998 ++
 ce_expr.tab.hh                                     |   217 +
 conf/arg-nonnull.h                                 |    26 -
 conf/c++defs.h                                     |   271 -
 conf/check_zlib.m4                                 |   122 -
 conf/compile                                       |   143 +
 conf/config.guess                                  |  1501 +
 conf/config.sub                                    |  1705 ++
 conf/depcomp                                       |   630 +
 conf/install-sh                                    |   520 +
 conf/libtool.m4                                    |  7357 +++++
 conf/ltmain.sh                                     |  8406 ++++++
 conf/ltoptions.m4                                  |   368 +
 conf/ltsugar.m4                                    |   123 +
 conf/ltversion.m4                                  |    23 +
 conf/lt~obsolete.m4                                |    92 +
 conf/missing                                       |   376 +
 conf/warn-on-use.h                                 |   109 -
 config.h.in                                        |  1236 +
 configure                                          | 29383 +++++++++++++++++++
 coverity_model.cpp                                 |    14 -
 cvsdate                                            |    53 -
 d4_ce/Makefile.in                                  |  1111 +
 d4_ce/d4_ce_parser.tab.cc                          |  1961 ++
 d4_ce/d4_ce_parser.tab.hh                          |   801 +
 d4_ce/location.hh                                  |   192 +
 d4_ce/position.hh                                  |   180 +
 d4_ce/stack.hh                                     |   157 +
 d4_function/Makefile.in                            |  1080 +
 d4_function/d4_function_parser.tab.cc              |  2477 ++
 d4_function/d4_function_parser.tab.hh              |   852 +
 d4_function/location.hh                            |   192 +
 d4_function/position.hh                            |   180 +
 d4_function/stack.hh                               |   157 +
 das.tab.cc                                         |  2119 ++
 das.tab.hh                                         |   123 +
 dds.tab.cc                                         |  2091 ++
 dds.tab.hh                                         |   138 +
 deflate.c                                          |   145 -
 depend.sh                                          |   114 -
 dods-datatypes.h                                   |    38 +
 doxy_private.conf                                  |   950 -
 error-test.cc                                      |   203 -
 fdiostream.cc                                      |   266 -
 fdiostream.h                                       |   182 -
 get-version.awk                                    |     9 -
 gl/Makefile.in                                     |  1926 ++
 gl/iswblank.c                                      |    27 -
 gl/m4/.gitignore                                   |     2 -
 gl/m4/mbchar.m4                                    |    20 -
 gl/m4/mbiter.m4                                    |    17 -
 gl/m4/memchr.m4                                    |    18 -
 gl/m4/restrict.m4                                  |    38 -
 gl/m4/strcase.m4                                   |    45 -
 gl/m4/strings_h.m4                                 |    52 -
 gl/mbchar.c                                        |    37 -
 gl/mbchar.h                                        |   419 -
 gl/mbuiter.h                                       |   192 -
 gl/memchr.c                                        |   198 -
 gl/strcase.h                                       |    46 -
 gl/strcasecmp.c                                    |    62 -
 gl/strings.in.h                                    |   122 -
 gl/strncasecmp.c                                   |    62 -
 gl/strnlen1.c                                      |    38 -
 gl/strnlen1.h                                      |    39 -
 install_libdap_source_deps.sh                      |    13 -
 installdap                                         |   221 -
 lex.Error.cc                                       |  2000 ++
 lex.ce_expr.cc                                     |  2089 ++
 lex.das.cc                                         |  2171 ++
 lex.dds.cc                                         |  2119 ++
 old/D4ResponseBuilder.cc                           |  1661 --
 old/D4ResponseBuilder.h                            |   196 -
 regex_test.cc                                      |     6 -
 tests/.gitignore                                   |     1 -
 tests/DASTest                                      |  3783 +++
 tests/DDSTest                                      |  4958 ++++
 tests/DMRTest                                      | 20665 +++++++++++++
 tests/EXPRTest                                     | 13068 +++++++++
 tests/Makefile.in                                  |  1613 +
 tests/TestCommon.cc                                |    30 -
 tests/dmr-testsuite/.DS_Store                      |   Bin 0 -> 6148 bytes
 tests/dmr-testsuite/._.DS_Store                    |   Bin 0 -> 120 bytes
 .../big-endian/test_array_3.1.dmr.1.trans_base     |    33 -
 .../big-endian/test_array_3.1.dmr.2.trans_base     |    27 -
 .../big-endian/test_array_3.1.dmr.3.trans_base     |    25 -
 .../big-endian/test_array_3.1.dmr.4.trans_base     |    25 -
 .../big-endian/test_array_3.1.dmr.5.trans_base     |    27 -
 .../universal/test_simple_7.xml.f.trans_base~      |    22 +
 tests/dmrset/test_atomic_array.nc.dmr              |    75 -
 tests/dmrset/test_atomic_array.syn.dmr             |    70 -
 tests/dmrset/test_atomic_types.nc.dmr              |    73 -
 tests/dmrset/test_atomic_types.syn.dmr             |    73 -
 tests/dmrset/test_enum.nc.dmr                      |    29 -
 tests/dmrset/test_enum_array.nc.dmr                |    31 -
 tests/dmrset/test_groups1.nc.dmr                   |    30 -
 tests/dmrset/test_one_var.nc.dmr                   |     9 -
 tests/dmrset/test_one_vararray.nc.dmr              |    12 -
 tests/dmrset/test_struct_array.nc.dmr              |    18 -
 tests/dmrset/test_struct_array_2.nc.dmr            |    26 -
 tests/dmrset/test_struct_nested.hdf5.dmr           |    20 -
 tests/dmrset/test_struct_nested3.hdf5.dmr          |    15 -
 tests/dmrset/test_struct_type.nc.dmr               |    14 -
 tests/dmrset/test_utf8.nc.dmr                      |    12 -
 tests/dmrset/test_vlen1.nc.dmr                     |    11 -
 tests/dmrset/test_vlen2.nc.dmr                     |    15 -
 tests/dmrset/test_vlen3.hdf5.dmr                   |    13 -
 tests/dmrset/test_vlen5.hdf5.dmr                   |    15 -
 tests/expr-testsuite/data.21.base~                 |     6 +
 tests/expr-testsuite/data.24.base.tmp~             |    10 +
 tests/getdap4Test.at                               |   104 -
 tests/getdapTest                                   |  2034 ++
 tests/io_test.cc                                   |    64 -
 tests/package.m4                                   |     6 +
 tests/valgrind-osx-10.8.txt                        |  2420 --
 unit-tests/AISDatabaseParserTest.cc                |   174 -
 unit-tests/AISResourcesTest.cc                     |   319 -
 unit-tests/DODSFilterTest.cc                       |   345 -
 unit-tests/Keywords2Test.cc                        |   217 -
 unit-tests/Makefile.in                             |  1814 ++
 unit-tests/ResponseBuilderTest.cc                  |   435 -
 unit-tests/ResponseCacheTest.cc                    |   367 -
 unit-tests/ThreadTest.cc                           |   115 -
 unit-tests/ais_testsuite/123.das                   |     5 -
 unit-tests/ais_testsuite/ais_database.xml.in       |    42 -
 unit-tests/ais_testsuite/ais_error_1.xml           |     6 -
 unit-tests/ais_testsuite/ais_error_2.xml           |    10 -
 unit-tests/ais_testsuite/ais_error_3.xml           |    10 -
 unit-tests/ais_testsuite/ais_error_4.xml           |    10 -
 unit-tests/ais_testsuite/ais_error_5.xml           |    10 -
 unit-tests/ais_testsuite/ais_error_6.xml           |    10 -
 unit-tests/ais_testsuite/bears_1.nc.das            |     5 -
 unit-tests/ais_testsuite/coads.das                 |     5 -
 unit-tests/ais_testsuite/fnoc1.nc.das              |     8 -
 unit-tests/ais_testsuite/fnoc2_replace.das         |    24 -
 unit-tests/ais_testsuite/fnoc3_fallback.das        |    14 -
 unit-tests/ais_testsuite/starts_with_number.das    |     9 -
 unit-tests/cache-testsuite/Makefile.in             |   853 +
 .../cache-testsuite/singleton_cache_init/.index    |     0
 .../cache-testsuite/valgrind_suppressions.txt      |    12 -
 .../chunked-io/test_big_binary_file.bin.chunked    |   Bin 0 -> 464044 bytes
 .../chunked-io/test_big_binary_file.bin.plain      |   Bin 0 -> 406032 bytes
 .../chunked-io/test_big_binary_file_2.bin.chunked  |   Bin 0 -> 62 bytes
 .../chunked-io/test_big_binary_file_2.bin.plain    |   Bin 0 -> 24 bytes
 .../chunked-io/test_small_text_file.txt.chunked    |   Bin 0 -> 29 bytes
 .../chunked-io/test_small_text_file.txt.plain      |     1 +
 unit-tests/chunked-io/test_text_file.txt.chunked   |   Bin 0 -> 12913 bytes
 .../test_text_file.txt.plain}                      |     2 +-
 unit-tests/fdiostream.txt                          |     1 -
 unit-tests/fdiostreamTest.cc                       |   344 -
 unit-tests/osx_10.9_leaks.txt                      |   131 -
 unit-tests/test_config.h                           |     7 +
 util.cc                                            |     5 +-
 win32/gl/Makefile.am                               |   417 -
 win32/gl/alloca.c                                  |   489 -
 win32/gl/alloca.h                                  |    54 -
 win32/gl/config.charset                            |   639 -
 win32/gl/configmake.h                              |    24 -
 win32/gl/gettext.h                                 |   270 -
 win32/gl/localcharset.c                            |   471 -
 win32/gl/localcharset.h                            |    41 -
 win32/gl/malloc.c                                  |    57 -
 win32/gl/mbchar.c                                  |    37 -
 win32/gl/mbchar.h                                  |   419 -
 win32/gl/mbuiter.h                                 |   192 -
 win32/gl/memchr.c                                  |   198 -
 win32/gl/ref-add.sin                               |    30 -
 win32/gl/ref-del.sin                               |    25 -
 win32/gl/regcomp.c                                 |  2181 --
 win32/gl/regex.c                                   |    71 -
 win32/gl/regex.h                                   |   675 -
 win32/gl/regex_internal.c                          |  1741 --
 win32/gl/regex_internal.h                          |   857 -
 win32/gl/regexec.c                                 |  2101 --
 win32/gl/stdbool.h                                 |   120 -
 win32/gl/stdint.h                                  |   799 -
 win32/gl/strcase.h                                 |    46 -
 win32/gl/strcasecmp.c                              |   100 -
 win32/gl/strncasecmp.c                             |    63 -
 win32/gl/strnlen1.c                                |    38 -
 win32/gl/strnlen1.h                                |    39 -
 xdr-datatypes.h                                    |    31 +
 206 files changed, 133659 insertions(+), 27379 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git



More information about the debian-science-commits mailing list