[libdap] 41/48: Merge branch 'master' (upstream 3.12.0) into debian

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Jul 5 10:17:15 UTC 2015


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

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit d9b5ed98d242fc68f66e40de199762d5c994da14
Merge: 521b026 d451328
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Oct 17 22:27:40 2013 +0100

    Merge branch 'master' (upstream 3.12.0) into debian

 AlarmHandler.h                                     |    32 +-
 Ancillary.h                                        |     2 +-
 Array.cc                                           |   259 +-
 Array.h                                            |    14 +-
 ArrayGeoConstraint.cc                              |   212 -
 ArrayGeoConstraint.h                               |   140 -
 AttrTable.cc                                       |    10 +-
 AttrTable.h                                        |     2 +-
 BaseType.cc                                        |   308 +-
 BaseType.h                                         |   124 +-
 BaseTypeFactory.cc                                 |    38 +-
 BaseTypeFactory.h                                  |     4 +-
 Byte.cc                                            |    99 +-
 Byte.h                                             |    32 +-
 ChangeLog                                          |   682 +-
 Clause.cc                                          |     2 +-
 Clause.h                                           |     2 +-
 Connect.cc                                         |   966 +-
 Connect.h                                          |     2 +-
 ConstraintEvaluator.cc                             |    70 +-
 ConstraintEvaluator.h                              |    20 +-
 Constructor.cc                                     |   669 +-
 Constructor.h                                      |    69 +-
 BaseTypeFactory.cc => D4BaseTypeFactory.cc         |    85 +-
 tests/TestTypeFactory.h => D4BaseTypeFactory.h     |    95 +-
 D4Dimensions.cc                                    |    23 +
 D4Dimensions.h                                     |    64 +
 D4EnumDef.cc                                       |    79 +
 D4EnumDef.h                                        |    85 +
 D4Group.cc                                         |   130 +
 D4Group.h                                          |    45 +
 D4Maps.cc                                          |    23 +
 D4Maps.h                                           |    43 +
 DDXExceptions.h => D4ParseError.h                  |    16 +-
 D4ParserSax2.cc                                    |  1197 ++
 DDXParserSAX2.h => D4ParserSax2.h                  |   132 +-
 DAP4StreamMarshaller.cc                            |   547 +
 DAP4StreamMarshaller.h                             |   154 +
 DAP4StreamUnMarshaller.cc                          |   412 +
 DAP4StreamUnMarshaller.h                           |   144 +
 DAPCache3.cc                                       |   988 -
 DAPCache3.h                                        |   152 -
 DAS.cc                                             |    15 +-
 DAS.h                                              |     6 +-
 DDS.cc                                             |   692 +-
 DDS.h                                              |    52 +-
 DDXExceptions.h                                    |     2 +-
 DDXParserSAX2.cc                                   |   122 +-
 DDXParserSAX2.h                                    |     6 +-
 DODSFilter.cc                                      |   215 +-
 DODSFilter.h                                       |     6 +-
 DapIndent.cc                                       |     2 +-
 DapIndent.h                                        |     2 +-
 DapObj.h                                           |     2 +-
 DataDDS.cc                                         |     7 +-
 DataDDS.h                                          |     2 +-
 EncodingType.h                                     |     2 +-
 Error.cc                                           |    10 +-
 Error.h                                            |     2 +-
 Error.lex                                          |     5 +-
 Error.tab.cc                                       |   425 +-
 Error.tab.hh                                       |    87 +-
 Error.y => Error.yy                                |    23 +-
 EventHandler.h                                     |     2 +-
 Float32.cc                                         |   105 +-
 Float32.h                                          |    21 +-
 Float64.cc                                         |   104 +-
 Float64.h                                          |    23 +-
 GNU/GNURegex.cc                                    |    20 +-
 GNU/GNURegex.h                                     |     2 +-
 GNU/GetOpt.cc                                      |     6 +-
 GSEClause.cc                                       |   351 -
 GSEClause.h                                        |   143 -
 GeoConstraint.cc                                   |   658 -
 GeoConstraint.h                                    |   376 -
 Grid.cc                                            |   479 +-
 Grid.h                                             |    33 +-
 GridGeoConstraint.cc                               |   398 -
 GridGeoConstraint.h                                |    86 -
 HTTPCache.cc                                       |     5 +-
 HTTPCache.h                                        |     2 +-
 HTTPCacheDisconnectedMode.h                        |     2 +-
 HTTPCacheInterruptHandler.h                        |     2 +-
 HTTPCacheResponse.h                                |     2 +-
 HTTPCacheTable.cc                                  |     7 +-
 HTTPCacheTable.h                                   |     2 +-
 HTTPConnect.cc                                     |    14 +-
 HTTPConnect.h                                      |     2 +-
 HTTPResponse.h                                     |     2 +-
 INSTALL                                            |     4 +-
 Int16.cc                                           |    99 +-
 Int16.h                                            |    23 +-
 Int32.cc                                           |    99 +-
 Int32.h                                            |    27 +-
 Int64.cc                                           |   257 +
 Float32.h => Int64.h                               |    73 +-
 Int8.cc                                            |   252 +
 Int16.h => Int8.h                                  |    65 +-
 InternalErr.cc                                     |     4 +-
 InternalErr.h                                      |     2 +-
 Keywords2.cc                                       |     8 +-
 Keywords2.h                                        |     2 +-
 Makefile.am                                        |   162 +-
 Makefile.in                                        |   910 +-
 Marshaller.h                                       |     2 +-
 NEWS                                               |    13 +
 OSX_Resources/Info.plist                           |    46 -
 OSX_Resources/ReadMe.txt                           |   247 -
 ObjectType.h                                       |     2 +-
 Operators.h                                        |   324 +-
 PipeResponse.h                                     |     2 +-
 RCReader.cc                                        |     2 +-
 RCReader.h                                         |     2 +-
 README                                             |    16 +-
 RValue.cc                                          |    10 +-
 RValue.h                                           |    10 +-
 Resource.h                                         |     2 +-
 Response.h                                         |     2 +-
 ResponseBuilder.cc                                 |  1507 --
 ResponseBuilder.h                                  |   184 -
 ResponseTooBigErr.cc                               |     4 +-
 ResponseTooBigErr.h                                |     2 +-
 Sequence.cc                                        |   207 +-
 Sequence.h                                         |    51 +-
 ServerFunction.cc                                  |    88 +
 ServerFunction.h                                   |   136 +
 ServerFunctionsList.cc                             |   457 +
 ServerFunctionsList.h                              |    83 +
 SignalHandler.cc                                   |     8 +-
 SignalHandler.h                                    |     2 +-
 SignalHandlerRegisteredErr.h                       |     2 +-
 StdinResponse.h                                    |     2 +-
 Str.cc                                             |    61 +-
 Str.h                                              |    11 +-
 Structure.cc                                       |   196 +-
 Structure.h                                        |    66 +-
 UInt16.cc                                          |    98 +-
 UInt16.h                                           |    23 +-
 UInt32.cc                                          |    98 +-
 UInt32.h                                           |    23 +-
 UInt64.cc                                          |   230 +
 Float32.h => UInt64.h                              |    68 +-
 UnMarshaller.h                                     |     2 +-
 Url.cc                                             |     2 +-
 Url.h                                              |     4 +-
 VCPP/sample/getdap.cc                              |     6 +-
 Vector.cc                                          |   305 +-
 Vector.h                                           |    26 +-
 XDRFileMarshaller.cc                               |     2 +-
 XDRFileMarshaller.h                                |     2 +-
 XDRFileUnMarshaller.cc                             |    12 +-
 XDRFileUnMarshaller.h                              |     3 +-
 XDRStreamMarshaller.cc                             |   515 +-
 XDRStreamMarshaller.h                              |    39 +-
 XDRStreamUnMarshaller.cc                           |   340 +-
 XDRStreamUnMarshaller.h                            |    41 +-
 XDRUtils.cc                                        |     2 +-
 XDRUtils.h                                         |     2 +-
 XMLWriter.cc                                       |    48 +
 XMLWriter.h                                        |    23 +
 aclocal.m4                                         |   330 +-
 ce_expr.lex                                        |    78 +-
 ce_expr.tab.cc                                     |  1689 +-
 ce_expr.tab.hh                                     |   186 +-
 ce_expr.y                                          |  1042 -
 ce_expr.yy                                         |  1346 ++
 ce_functions.cc                                    |  1232 --
 ce_functions.h                                     |    66 -
 ce_parser.h                                        |     5 +
 conf/._config.guess                                |   Bin 197 -> 0 bytes
 conf/._config.sub                                  |   Bin 197 -> 0 bytes
 conf/._depcomp                                     |   Bin 197 -> 0 bytes
 conf/._install-sh                                  |   Bin 197 -> 0 bytes
 conf/._libtool.m4                                  |   Bin 197 -> 0 bytes
 conf/._ltmain.sh                                   |   Bin 197 -> 0 bytes
 conf/._ltoptions.m4                                |   Bin 197 -> 0 bytes
 conf/._ltsugar.m4                                  |   Bin 197 -> 0 bytes
 conf/._ltversion.m4                                |   Bin 197 -> 0 bytes
 conf/._lt~obsolete.m4                              |   Bin 197 -> 0 bytes
 conf/._missing                                     |   Bin 197 -> 0 bytes
 conf/acinclude.m4                                  |    29 +-
 conf/config.guess                                  |   449 +-
 conf/config.sub                                    |   227 +-
 conf/depcomp                                       |   189 +-
 conf/install-sh                                    |    35 +-
 conf/libtool.m4                                    |   265 +-
 conf/ltmain.sh                                     |    95 +-
 conf/ltoptions.m4                                  |    19 +-
 conf/ltversion.m4                                  |    10 +-
 conf/missing                                       |   148 +-
 conf/snippet/_Noreturn.h                           |    10 +
 conf/{ => snippet}/arg-nonnull.h                   |     4 +-
 conf/{ => snippet}/c++defs.h                       |     4 +-
 conf/{ => snippet}/warn-on-use.h                   |     4 +-
 config.h.in                                        |   311 +-
 configure                                          |  7902 +++++---
 configure.ac                                       |   310 +-
 dap-config.in                                      |    10 +-
 das.lex                                            |     5 +-
 das.tab.cc                                         |   646 +-
 das.tab.hh                                         |    96 +-
 das.y => das.yy                                    |    25 +-
 dds.lex                                            |     5 +-
 dds.tab.cc                                         |   630 +-
 dds.tab.hh                                         |   115 +-
 dds.y => dds.yy                                    |    26 +-
 debug.h                                            |     2 +-
 dods-datatypes-config.h.in                         |    13 +-
 dods-datatypes-static.h                            |     7 +
 dods-datatypes.h                                   |     7 +
 dods-limits.h                                      |    35 +-
 doxy.conf                                          |     2 +-
 escaping.cc                                        |     2 +-
 escaping.h                                         |     2 +-
 expr.h                                             |    15 +-
 getdap.cc                                          |     6 +-
 gl/Makefile.am                                     |   650 +-
 gl/Makefile.in                                     |   882 +-
 gl/alloca.in.h                                     |    10 +-
 gl/btowc.c                                         |     2 +-
 gl/byteswap.in.h                                   |    44 +
 gl/config.charset                                  |     7 +-
 gl/gettext.h                                       |    13 +-
 gl/iswblank.c                                      |    27 -
 gl/langinfo.in.h                                   |    18 +-
 gl/localcharset.c                                  |    38 +-
 gl/localcharset.h                                  |     5 +-
 gl/locale.in.h                                     |   201 +
 gl/localeconv.c                                    |   103 +
 gl/m4/00gnulib.m4                                  |     2 +-
 gl/m4/alloca.m4                                    |    82 +-
 gl/m4/btowc.m4                                     |     9 +-
 gl/m4/byteswap.m4                                  |    19 +
 gl/m4/codeset.m4                                   |     2 +-
 gl/m4/configmake.m4                                |     2 +-
 gl/m4/extensions.m4                                |    11 +-
 gl/m4/fcntl-o.m4                                   |    17 +-
 gl/m4/glibc21.m4                                   |     2 +-
 gl/m4/gnulib-cache.m4                              |    26 +-
 gl/m4/gnulib-common.m4                             |   155 +-
 gl/m4/gnulib-comp.m4                               |   213 +-
 gl/m4/gnulib-tool.m4                               |     2 +-
 gl/m4/include_next.m4                              |    54 +-
 gl/m4/langinfo_h.m4                                |     2 +-
 gl/m4/localcharset.m4                              |     2 +-
 gl/m4/locale-fr.m4                                 |   154 +-
 gl/m4/locale-ja.m4                                 |    88 +-
 gl/m4/locale-zh.m4                                 |    71 +-
 gl/m4/locale_h.m4                                  |   122 +
 gl/m4/localeconv.m4                                |    22 +
 gl/m4/longlong.m4                                  |    87 +-
 gl/m4/malloc.m4                                    |    52 +-
 gl/m4/mbrtowc.m4                                   |    97 +-
 gl/m4/mbsinit.m4                                   |    33 +-
 gl/m4/mbstate_t.m4                                 |     2 +-
 gl/m4/mbtowc.m4                                    |    19 +
 gl/m4/multiarch.m4                                 |     6 +-
 gl/m4/nl_langinfo.m4                               |     6 +-
 gl/m4/off_t.m4                                     |    18 +
 gl/m4/regex.m4                                     |    11 +-
 gl/m4/ssize_t.m4                                   |     2 +-
 gl/m4/stdbool.m4                                   |    17 +-
 gl/m4/stddef_h.m4                                  |     8 +-
 gl/m4/stdint.m4                                    |    32 +-
 gl/m4/stdlib_h.m4                                  |    40 +-
 gl/m4/strcase.m4                                   |    45 +
 gl/m4/strings_h.m4                                 |    52 +
 gl/m4/sys_types_h.m4                               |    24 +
 gl/m4/unistd_h.m4                                  |   125 +-
 gl/m4/warn-on-use.m4                               |    14 +-
 gl/m4/wchar_h.m4                                   |    99 +-
 gl/m4/wchar_t.m4                                   |     2 +-
 gl/m4/wcrtomb.m4                                   |    25 +-
 gl/m4/wctype_h.m4                                  |   165 +-
 gl/m4/wint_t.m4                                    |     2 +-
 gl/malloc.c                                        |    10 +-
 gl/mbrtowc.c                                       |    33 +-
 gl/mbsinit.c                                       |    18 +-
 gl/{wcrtomb.c => mbtowc-impl.h}                    |    47 +-
 gl/{btowc.c => mbtowc.c}                           |    27 +-
 gl/nl_langinfo.c                                   |     5 +-
 gl/ref-add.sin                                     |     5 +-
 gl/ref-del.sin                                     |     5 +-
 gl/regcomp.c                                       |   201 +-
 gl/regex.c                                         |    18 +-
 gl/regex.h                                         |   229 +-
 gl/regex_internal.c                                |    65 +-
 gl/regex_internal.h                                |    63 +-
 gl/regexec.c                                       |   156 +-
 gl/stdbool.in.h                                    |     5 +-
 gl/stddef.in.h                                     |    19 +-
 gl/stdint.in.h                                     |   208 +-
 gl/stdlib.in.h                                     |   278 +-
 gl/strcasecmp.c                                    |    62 +
 gl/streq.h                                         |    10 +-
 gl/strings.in.h                                    |   122 +
 gl/strncasecmp.c                                   |    62 +
 gl/sys_types.in.h                                  |    51 +
 gl/unistd.in.h                                     |   401 +-
 gl/verify.h                                        |   146 +-
 gl/wchar.in.h                                      |   631 +-
 gl/wcrtomb.c                                       |     2 +-
 gl/wctype.in.h                                     |   325 +-
 gse.lex                                            |   174 -
 gse.tab.cc                                         |  1716 --
 gse.tab.hh                                         |    88 -
 gse.y                                              |   228 -
 gse_parser.h                                       |    84 -
 lex.Error.cc                                       |    64 +-
 lex.ce_expr.cc                                     |   277 +-
 lex.das.cc                                         |    86 +-
 lex.dds.cc                                         |    78 +-
 lex.gse_.cc                                        |  1898 --
 libdap.spec                                        |     4 +-
 mime_util.cc                                       |   479 +-
 mime_util.h                                        |    36 +-
 parser-util.cc                                     |     6 +-
 parser.h                                           |     2 +-
 tests/DASTest                                      |  7848 +++-----
 tests/DDSTest                                      |  6309 +++---
 tests/EXPRTest                                     | 19358 ++++++-------------
 tests/EXPRTest.at                                  |    16 +-
 tests/Makefile.am                                  |    22 +-
 tests/Makefile.in                                  |   370 +-
 tests/ResponseBuilder.cc                           |   488 +
 tests/ResponseBuilder.h                            |    74 +
 tests/TestArray.cc                                 |    13 +-
 tests/TestArray.h                                  |     2 +-
 tests/TestByte.cc                                  |    18 +-
 tests/TestByte.h                                   |     2 +-
 tests/TestCommon.h                                 |     2 +-
 tests/TestFloat32.cc                               |    16 +-
 tests/TestFloat32.h                                |     2 +-
 tests/TestFloat64.cc                               |    12 +-
 tests/TestFloat64.h                                |     2 +-
 tests/TestGrid.cc                                  |     2 +-
 tests/TestGrid.h                                   |     2 +-
 tests/TestInt16.cc                                 |    10 +-
 tests/TestInt16.h                                  |     2 +-
 tests/TestInt32.cc                                 |    16 +-
 tests/TestInt32.h                                  |     2 +-
 tests/TestSequence.cc                              |     2 +-
 tests/TestSequence.h                               |     2 +-
 tests/TestStr.cc                                   |     2 +-
 tests/TestStr.h                                    |     2 +-
 tests/TestStructure.cc                             |     2 +-
 tests/TestStructure.h                              |     2 +-
 tests/TestTypeFactory.cc                           |     2 +-
 tests/TestTypeFactory.h                            |     2 +-
 tests/TestUInt16.cc                                |    10 +-
 tests/TestUInt16.h                                 |     2 +-
 tests/TestUInt32.cc                                |    10 +-
 tests/TestUInt32.h                                 |     2 +-
 tests/TestUrl.cc                                   |     2 +-
 tests/TestUrl.h                                    |     2 +-
 tests/atconfig                                     |    10 +-
 tests/das-test.cc                                  |     5 +-
 tests/dds-test.cc                                  |    76 +-
 tests/expr-test.cc                                 |    50 +-
 tests/package.m4                                   |     4 +-
 unit-tests/ArrayGeoConstraintTest.cc               |   231 -
 unit-tests/ArrayTest.cc                            |     2 +-
 unit-tests/AttrTableTest.cc                        |    27 +-
 unit-tests/ByteTest.cc                             |     2 +-
 unit-tests/CEFunctionsTest.cc                      |   582 -
 unit-tests/D4-xml/D4Dimensions_1.xml               |     2 +
 unit-tests/D4-xml/D4Dimensions_2.xml               |     3 +
 unit-tests/D4-xml/D4Dimensions_3.xml               |     4 +
 unit-tests/D4-xml/D4Dimensions_4.xml               |     5 +
 unit-tests/D4-xml/D4Dimensions_empty.xml           |     1 +
 unit-tests/D4-xml/D4EnumDefs_1.xml                 |     5 +
 unit-tests/D4-xml/D4EnumDefs_2.xml                 |     9 +
 unit-tests/D4-xml/D4EnumDefs_3.xml                 |     9 +
 unit-tests/D4-xml/D4EnumDefs_empty.xml             |     1 +
 unit-tests/D4-xml/D4EnumDefs_values_1.xml          |     3 +
 unit-tests/D4-xml/README                           |     7 +
 unit-tests/D4DimensionsTest.cc                     |   183 +
 unit-tests/D4EnumDefsTest.cc                       |   190 +
 unit-tests/DAP4MarshallerTest.cc                   |   311 +
 unit-tests/DAP4UnMarshallerTest.cc                 |   362 +
 unit-tests/DASTest.cc                              |     2 +-
 unit-tests/DDSTest.cc                              |    84 +-
 unit-tests/DDXParserTest.cc                        |  1140 +-
 unit-tests/DODSFilterTest.cc                       |   353 -
 unit-tests/GridGeoConstraintTest.cc                |  1312 --
 unit-tests/HTTPCacheTest.cc                        |    18 +-
 unit-tests/HTTPConnectTest.cc                      |    18 +-
 unit-tests/Keywords2Test.cc                        |   217 -
 unit-tests/MIMEUtilTest.cc                         |     2 +-
 unit-tests/Makefile.am                             |    66 +-
 unit-tests/Makefile.in                             |   565 +-
 unit-tests/MarshallerTest.cc                       |    66 +-
 unit-tests/RCReaderTest.cc                         |     2 +-
 unit-tests/RegexTest.cc                            |     2 +-
 unit-tests/ResponseBuilderTest.cc                  |   428 -
 unit-tests/SequenceTest.cc                         |     2 +-
 unit-tests/ServerFunctionsListUnitTest.cc          |   213 +
 unit-tests/SignalHandlerTest.cc                    |   127 +-
 unit-tests/ancT.cc                                 |     2 +-
 unit-tests/arrayT.cc                               |     2 +-
 unit-tests/cache-testsuite/Makefile.in             |   176 +-
 unit-tests/ce-functions-testsuite/geo_grid.das     |    35 -
 unit-tests/ce-functions-testsuite/geo_grid.dds     |    38 -
 unit-tests/ce-functions-testsuite/geo_grid_3d.dds  |    11 -
 .../ce-functions-testsuite/geo_grid_coads_lon.dds  |    10 -
 unit-tests/ce-functions-testsuite/two_grid.das     |     8 -
 unit-tests/ce-functions-testsuite/two_grid.dds     |    28 -
 unit-tests/dds-testsuite/fnoc1.nc.dmr.xml          |    79 +
 unit-tests/dds-testsuite/test.19b.xml              |     2 +-
 unit-tests/dds-testsuite/test.19b6.xml             |     2 +-
 unit-tests/dds-testsuite/test.19c.xml              |     2 +-
 unit-tests/dds-testsuite/test.19d.xml              |     2 +-
 unit-tests/dds-testsuite/test.19e.xml              |     2 +-
 unit-tests/dds-testsuite/test.19f.xml              |     2 +-
 unit-tests/ddsT.cc                                 |     2 +-
 unit-tests/ddx-testsuite/test.09.ddx               |     2 +-
 unit-tests/generalUtilTest.cc                      |     2 +-
 unit-tests/parserUtilTest.cc                       |     2 +-
 unit-tests/server-testsuite/config/unix.exp        |    48 -
 unit-tests/server-testsuite/geturl.0/dodsdev.exp   |   102 -
 unit-tests/server-testsuite/geturl.0/urls.tcl      |   275 -
 ...se_builder_invoke_server_side_function_test.txt |    19 +
 unit-tests/server-testsuite/send_das_baseline.txt  |    15 +
 unit-tests/server-testsuite/send_dds_baseline.txt  |    12 +
 .../server-testsuite/simple_function_baseline.txt  |    13 +
 unit-tests/structT.cc                              |   220 +-
 unit-tests/testFile.cc                             |    41 +-
 unit-tests/testFile.h                              |    10 +-
 unit-tests/test_config.h                           |     2 +-
 util.cc                                            |   927 +-
 util.h                                             |    75 +-
 util_mit.cc                                        |    13 +-
 util_mit.h                                         |     2 +-
 xdr-datatypes.h                                    |     4 +-
 434 files changed, 42698 insertions(+), 51272 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