[libdap] 20/22: Merge tag 'upstream/3.18.2' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Nov 4 15:20:57 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 e77fa29b5092fdcdaac1c7cc46a736b101b6f6b9
Merge: 60e2def b6c045b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 4 01:25:48 2016 +0000

    Merge tag 'upstream/3.18.2' into debian/master

 ChangeLog                                          |    69 +
 Error.tab.cc                                       |    30 +-
 Error.tab.hh                                       |     8 +-
 Grid.cc                                            |    23 +-
 INSTALL                                            |    15 +-
 Makefile.in                                        |     3 +-
 NEWS                                               |    11 +
 README                                             |    10 +-
 Vector.h                                           |     2 +-
 XDRStreamMarshaller.cc                             |     5 +-
 aclocal.m4                                         |     4 +-
 ce_expr.tab.cc                                     |   274 +-
 ce_expr.tab.hh                                     |     8 +-
 conf/libtool.m4                                    |     5 +-
 config.h.in                                        |    19 +-
 configure                                          | 27392 ++++++++++-----
 configure.ac                                       |    10 +-
 d4_ce/D4ConstraintEvaluator.cc                     |    18 +
 d4_ce/D4ConstraintEvaluator.h                      |     2 +
 d4_ce/Makefile.in                                  |     1 -
 d4_ce/d4_ce_parser.tab.cc                          |   124 +-
 d4_ce/d4_ce_parser.tab.hh                          |    13 +-
 d4_ce/d4_ce_parser.yy                              |    17 +-
 d4_ce/d4_ce_scanner.ll                             |     2 +-
 d4_ce/location.hh                                  |     8 +-
 d4_ce/position.hh                                  |     8 +-
 d4_ce/stack.hh                                     |     8 +-
 d4_function/Makefile.in                            |     1 -
 d4_function/d4_function_parser.tab.cc              |     4 +-
 d4_function/d4_function_parser.tab.hh              |    12 +-
 d4_function/location.hh                            |     8 +-
 d4_function/position.hh                            |     8 +-
 d4_function/stack.hh                               |     8 +-
 das.tab.cc                                         |   190 +-
 das.tab.hh                                         |     4 +-
 dds.tab.cc                                         |   154 +-
 dds.tab.hh                                         |     8 +-
 gl/Makefile.in                                     |     1 -
 lex.Error.cc                                       |    54 +-
 lex.ce_expr.cc                                     |    54 +-
 lex.das.cc                                         |    54 +-
 lex.dds.cc                                         |    54 +-
 libdap.spec                                        |     2 +-
 tests/DASTest                                      |  4075 ++-
 tests/DDSTest                                      |  5620 ++--
 tests/DMRTest                                      | 32924 ++++++++++++-------
 tests/DMRTest.at                                   |    15 +
 tests/EXPRTest                                     | 16660 ++++++----
 tests/Makefile.in                                  |     1 -
 tests/dmr-testsuite/.DS_Store                      |   Bin 6148 -> 0 bytes
 tests/dmr-testsuite/._.DS_Store                    |   Bin 120 -> 0 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 +
 tests/dmr-testsuite/names_with_spaces.dmr          |    31 +
 tests/dmr-testsuite/names_with_spaces2.dmr         |    33 +
 tests/dmr-testsuite/names_with_spaces3.dmr         |    33 +
 .../universal/names_with_spaces.dmr.1.trans_base   |    35 +
 .../universal/test_simple_7.xml.f.trans_base~      |    22 -
 tests/expr-testsuite/data.21.base~                 |     6 -
 tests/expr-testsuite/data.24.base.tmp~             |    10 -
 tests/getdapTest                                   |  1608 +-
 tests/package.m4                                   |     4 +-
 unit-tests/D4FilterClauseTest.cc                   |     2 +-
 unit-tests/Makefile.in                             |     1 -
 unit-tests/cache-testsuite/Makefile.in             |     1 -
 unit-tests/test_config.h                           |     2 +-
 util.cc                                            |     5 +-
 xdr-datatypes.h                                    |     4 +-
 71 files changed, 57396 insertions(+), 32538 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