[libkml] 03/18: Merge tag 'upstream/1.3.0_r864+git20131113-9b50572+dfsg'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Mar 13 00:59:34 UTC 2015


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

sebastic pushed a commit to branch master
in repository libkml.

commit dea97533da0083eec95a80ff0cb63c6a89eeb893
Merge: 1c77e89 e22bb87
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 12 23:10:38 2015 +0100

    Merge tag 'upstream/1.3.0_r864+git20131113-9b50572+dfsg'
    
    Upstream version 1.3.0~r864+git20131113-9b50572+dfsg

 .travis.yml                                        |     6 +
 INSTALL                                            |    15 +-
 Makefile.in                                        |   746 -
 README                                             |    31 +-
 README.md                                          |    30 +
 bactrian128.png                                    |   Bin 0 -> 9806 bytes
 configure.ac                                       |    24 +-
 examples/Makefile.in                               |   588 -
 examples/domviewer/Makefile.in                     |   374 -
 examples/engine/Makefile.am                        |     2 +-
 examples/engine/Makefile.in                        |   745 -
 examples/gpx/Makefile.am                           |     2 +-
 examples/gpx/Makefile.in                           |   502 -
 examples/gpx/gpxtracktokml.cc                      |     1 -
 examples/gx/Makefile.am                            |     2 +-
 examples/gx/Makefile.in                            |   520 -
 examples/hellonet/Makefile.am                      |     2 +-
 examples/hellonet/Makefile.in                      |   900 -
 examples/helloworld/Makefile.am                    |    10 +-
 examples/helloworld/Makefile.in                    |   828 -
 examples/helloworld/hellogeometry.cc               |     1 -
 examples/java/Makefile.in                          |   376 -
 examples/kml/Makefile.in                           |   393 -
 examples/python/Makefile.in                        |   379 -
 examples/regionator/Makefile.am                    |    10 +-
 examples/regionator/Makefile.in                    |   525 -
 examples/wxregionator/Makefile.in                  |   382 -
 examples/wxviewer/Makefile.in                      |   380 -
 examples/xsd/Makefile.am                           |     2 +-
 examples/xsd/Makefile.in                           |   588 -
 msvc/Makefile.in                                   |   583 -
 msvc/examples/Makefile.in                          |   381 -
 msvc/tests/Makefile.in                             |   446 -
 src/Makefile.in                                    |   580 -
 src/kml/Makefile.in                                |   627 -
 src/kml/base/Makefile.am                           |     6 +-
 src/kml/base/Makefile.in                           |  1490 --
 src/kml/base/csv_splitter_test.cc                  |     4 +-
 src/kml/base/date_time.cc                          |    38 +-
 src/kml/base/date_time.h                           |     2 +-
 src/kml/base/date_time_test.cc                     |    35 +-
 src/kml/base/expat_parser_test.cc                  |     2 +-
 src/kml/base/file_posix.cc                         |     1 +
 src/kml/base/string_util_test.cc                   |    18 +-
 src/kml/base/util.h                                |    29 +-
 src/kml/base/vec3.h                                |    38 +-
 src/kml/base/vec3_test.cc                          |    22 +-
 src/kml/base/zip_file.cc                           |     1 +
 src/kml/base/zip_file_test.cc                      |    14 +-
 src/kml/convenience/Makefile.am                    |     6 +-
 src/kml/convenience/Makefile.in                    |  1292 --
 src/kml/convenience/atom_util.cc                   |     2 +
 src/kml/convenience/convenience.cc                 |     3 +-
 src/kml/convenience/google_maps_data.h             |     1 +
 src/kml/convenience/http_client_test_util.h        |     2 +-
 src/kml/dom.h                                      |     1 +
 src/kml/dom/Makefile.am                            |     6 +-
 src/kml/dom/Makefile.in                            |  2622 ---
 src/kml/dom/element_test.cc                        |    28 +-
 src/kml/dom/geometry.cc                            |     2 +-
 src/kml/dom/geometry_test.cc                       |     3 +-
 src/kml/dom/kml_cast.h                             |     2 +
 src/kml/dom/kml_handler_test.cc                    |    20 +-
 src/kml/engine/Makefile.am                         |     6 +-
 src/kml/engine/Makefile.in                         |  1999 --
 src/kml/engine/kmz_file_test.cc                    |    10 +-
 src/kml/regionator/Makefile.am                     |     6 +-
 src/kml/regionator/Makefile.in                     |   866 -
 src/kml/regionator/regionator_qid_test.cc          |     6 +-
 src/kml/regionator/regionator_util.cc              |     2 +-
 src/kml/xsd/Makefile.am                            |     6 +-
 src/kml/xsd/Makefile.in                            |  1030 -
 src/kml/xsd/xsd_element.cc                         |     2 -
 src/kml/xsd/xsd_element.h                          |     2 -
 src/kml/xsd/xsd_element_test.cc                    |    14 +-
 src/swig/Makefile.in                               |   965 -
 src/swig/java/Makefile.in                          |   374 -
 src/swig/python/Makefile.in                        |   374 -
 testdata/Makefile.in                               |   577 -
 testdata/atom/Makefile.in                          |   380 -
 testdata/balloon/Makefile.in                       |   374 -
 testdata/csv/Makefile.in                           |   382 -
 testdata/deprecated/Makefile.in                    |   374 -
 testdata/gdata/Makefile.in                         |   379 -
 testdata/gmaps/Makefile.in                         |   374 -
 testdata/gpx/Makefile.in                           |   374 -
 testdata/gx/Makefile.in                            |   375 -
 testdata/kml/Makefile.in                           |   399 -
 testdata/kmz/Makefile.in                           |   599 -
 testdata/kmz/files/Makefile.in                     |   377 -
 testdata/kmz/kmzfiles/Makefile.in                  |   374 -
 testdata/kmz/rumsey/Makefile.in                    |   574 -
 testdata/kmz/rumsey/imagery/Makefile.in            |   372 -
 testdata/kmz/rumsey/kml/Makefile.in                |   376 -
 testdata/links/Makefile.in                         |   374 -
 testdata/style/Makefile.in                         |   607 -
 testdata/style/weather/Makefile.in                 |   386 -
 testdata/update/Makefile.in                        |   393 -
 testdata/xal/Makefile.in                           |   374 -
 testdata/xsd/Makefile.in                           |   374 -
 third_party/Makefile.am                            |   131 +-
 third_party/Makefile.in                            |  1174 --
 third_party/README                                 |    11 +-
 third_party/googletest-r108.win32/debug/gtest.lib  |   Bin 1590300 -> 0 bytes
 .../googletest-r108.win32/release/gtest.lib        |   Bin 1261580 -> 0 bytes
 third_party/googletest-r108/CHANGES                |    19 -
 third_party/googletest-r108/Makefile.am            |   317 -
 third_party/googletest-r108/README                 |   228 -
 third_party/googletest-r108/config_aux/.keep       |     0
 third_party/googletest-r108/include/gtest/gtest.h  |  1240 --
 .../include/gtest/internal/gtest-internal.h        |   835 -
 .../include/gtest/internal/gtest-port.h            |   713 -
 .../include/gtest/internal/gtest-string.h          |   313 -
 third_party/googletest-r108/msvc/gtest.sln         |    85 -
 third_party/googletest-r108/msvc/gtest.vcproj      |   222 -
 .../msvc/gtest_uninitialized_test_.vcproj          |   144 -
 third_party/googletest-r108/scons/SConscript       |   181 -
 .../googletest-r108/scripts/gtest-config.in        |   199 -
 .../googletest-r108/src/gtest-death-test.cc        |   775 -
 .../googletest-r108/src/gtest-internal-inl.h       |  1234 --
 third_party/googletest-r108/src/gtest-port.cc      |   308 -
 third_party/googletest-r108/src/gtest.cc           |  3838 ----
 .../googletest-r108/test/gtest-filepath_test.cc    |   542 -
 .../googletest-r108/test/gtest-options_test.cc     |   122 -
 .../googletest-r108/test/gtest-test-part_test.cc   |   138 -
 .../googletest-r108/test/gtest_filter_unittest.py  |   315 -
 .../test/gtest_list_tests_unittest.py              |   165 -
 third_party/googletest-r108/test/gtest_nc.cc       |   193 -
 third_party/googletest-r108/test/gtest_nc_test.py  |    89 -
 .../googletest-r108/test/gtest_output_test.py      |   214 -
 .../test/gtest_output_test_golden_win.txt          |   544 -
 .../googletest-r108/test/gtest_stress_test.cc      |   152 -
 .../googletest-r108/test/gtest_test_utils.py       |   126 -
 third_party/googletest-r108/test/gtest_unittest.cc |  4934 -----
 .../test/gtest_xml_output_unittest.py              |   179 -
 .../xcode/Config/InternalTestTarget.xcconfig       |     8 -
 .../googletest-r108/xcode/Scripts/runtests.sh      |    64 -
 .../xcode/gtest.xcodeproj/project.pbxproj          |  4219 ----
 third_party/gtest-1.7.0/CHANGES                    |   157 +
 third_party/gtest-1.7.0/CMakeLists.txt             |   252 +
 .../{googletest-r108 => gtest-1.7.0}/CONTRIBUTORS  |    10 +-
 .../COPYING => gtest-1.7.0/LICENSE}                |     0
 third_party/gtest-1.7.0/Makefile.am                |   306 +
 third_party/gtest-1.7.0/Makefile.in                |  1360 ++
 third_party/gtest-1.7.0/README                     |   435 +
 aclocal.m4 => third_party/gtest-1.7.0/aclocal.m4   |   307 +-
 .../gtest-1.7.0/build-aux}/config.guess            |   258 +-
 .../gtest-1.7.0/build-aux/config.h.in              |    53 +-
 .../gtest-1.7.0/build-aux}/config.sub              |   209 +-
 .../gtest-1.7.0/build-aux}/depcomp                 |    74 +-
 .../gtest-1.7.0/build-aux}/install-sh              |    29 +-
 .../gtest-1.7.0/build-aux}/ltmain.sh               |  4016 ++--
 .../gtest-1.7.0/build-aux}/missing                 |    53 +-
 third_party/gtest-1.7.0/cmake/internal_utils.cmake |   227 +
 third_party/gtest-1.7.0/codegear/gtest.cbproj      |   138 +
 third_party/gtest-1.7.0/codegear/gtest.groupproj   |    54 +
 .../codegear/gtest_all.cc}                         |    14 +-
 .../codegear/gtest_link.cc}                        |    19 +-
 third_party/gtest-1.7.0/codegear/gtest_main.cbproj |    82 +
 .../gtest-1.7.0/codegear/gtest_unittest.cbproj     |    88 +
 configure => third_party/gtest-1.7.0/configure     |  7175 +++----
 .../{googletest-r108 => gtest-1.7.0}/configure.ac  |    35 +-
 .../gtest-1.7.0/fused-src/gtest/gtest-all.cc       |  9592 +++++++++
 third_party/gtest-1.7.0/fused-src/gtest/gtest.h    | 20061 +++++++++++++++++++
 .../fused-src/gtest}/gtest_main.cc                 |     9 +-
 .../include/gtest/gtest-death-test.h               |   129 +-
 .../include/gtest/gtest-message.h                  |    90 +-
 .../gtest-1.7.0/include/gtest/gtest-param-test.h   |  1421 ++
 .../include/gtest/gtest-param-test.h.pump          |   487 +
 .../gtest-1.7.0/include/gtest/gtest-printers.h     |   855 +
 .../include/gtest/gtest-spi.h                      |    66 +-
 .../include/gtest/gtest-test-part.h                |    84 +-
 .../include/gtest/gtest-typed-test.h               |    44 +-
 third_party/gtest-1.7.0/include/gtest/gtest.h      |  2291 +++
 .../include/gtest/gtest_pred_impl.h                |    94 +-
 .../include/gtest/gtest_prod.h                     |     0
 .../gtest/internal/gtest-death-test-internal.h     |   148 +-
 .../include/gtest/internal/gtest-filepath.h        |    38 +-
 .../include/gtest/internal/gtest-internal.h        |  1158 ++
 .../include/gtest/internal/gtest-linked_ptr.h      |   233 +
 .../gtest/internal/gtest-param-util-generated.h    |  5143 +++++
 .../internal/gtest-param-util-generated.h.pump     |   301 +
 .../include/gtest/internal/gtest-param-util.h      |   619 +
 .../include/gtest/internal/gtest-port.h            |  1947 ++
 .../include/gtest/internal/gtest-string.h          |   167 +
 .../include/gtest/internal/gtest-tuple.h           |  1012 +
 .../include/gtest/internal/gtest-tuple.h.pump      |   339 +
 .../include/gtest/internal/gtest-type-util.h       |    84 +-
 .../include/gtest/internal/gtest-type-util.h.pump  |    80 +-
 third_party/gtest-1.7.0/m4/acx_pthread.m4          |   363 +
 .../{googletest-r108 => gtest-1.7.0}/m4/gtest.m4   |    63 +-
 {m4 => third_party/gtest-1.7.0/m4}/libtool.m4      |  2236 ++-
 {m4 => third_party/gtest-1.7.0/m4}/ltoptions.m4    |    32 +-
 {m4 => third_party/gtest-1.7.0/m4}/ltsugar.m4      |     0
 {m4 => third_party/gtest-1.7.0/m4}/ltversion.m4    |    12 +-
 {m4 => third_party/gtest-1.7.0/m4}/lt~obsolete.m4  |    12 +-
 third_party/gtest-1.7.0/make/Makefile              |    82 +
 third_party/gtest-1.7.0/msvc/gtest-md.sln          |    45 +
 .../msvc/gtest-md.vcproj}                          |   291 +-
 third_party/gtest-1.7.0/msvc/gtest.sln             |    45 +
 .../msvc/gtest.vcproj}                             |   270 +-
 .../msvc/gtest_main-md.vcproj}                     |   273 +-
 .../msvc/gtest_main.vcproj                         |   294 +-
 .../msvc/gtest_prod_test-md.vcproj}                |   308 +-
 .../msvc/gtest_prod_test.vcproj                    |   328 +-
 .../msvc/gtest_unittest-md.vcproj}                 |   294 +-
 .../msvc/gtest_unittest.vcproj                     |   294 +-
 third_party/gtest-1.7.0/samples/prime_tables.h     |   123 +
 .../samples/sample1.cc                             |     0
 .../samples/sample1.h                              |     0
 .../gtest-1.7.0/samples/sample10_unittest.cc       |   144 +
 .../samples/sample1_unittest.cc                    |     4 +-
 .../samples/sample2.cc                             |    16 +-
 .../samples/sample2.h                              |    13 +-
 .../samples/sample2_unittest.cc                    |    12 +-
 .../samples/sample3-inl.h                          |    55 +-
 .../samples/sample3_unittest.cc                    |     8 +-
 .../samples/sample4.cc                             |     0
 .../samples/sample4.h                              |     0
 .../samples/sample4_unittest.cc                    |     2 +-
 .../samples/sample5_unittest.cc                    |    26 +-
 .../samples/sample6_unittest.cc                    |    95 +-
 .../gtest-1.7.0/samples/sample7_unittest.cc        |   130 +
 .../gtest-1.7.0/samples/sample8_unittest.cc        |   173 +
 .../gtest-1.7.0/samples/sample9_unittest.cc        |   160 +
 .../gtest-1.7.0/scripts/fuse_gtest_files.py        |   250 +
 .../scripts/gen_gtest_pred_impl.py                 |    23 +-
 third_party/gtest-1.7.0/scripts/gtest-config.in    |   274 +
 third_party/gtest-1.7.0/scripts/pump.py            |   855 +
 third_party/gtest-1.7.0/scripts/test/Makefile      |    59 +
 .../src/gtest-all.cc                               |     7 +
 third_party/gtest-1.7.0/src/gtest-death-test.cc    |  1344 ++
 .../src/gtest-filepath.cc                          |   231 +-
 third_party/gtest-1.7.0/src/gtest-internal-inl.h   |  1218 ++
 third_party/gtest-1.7.0/src/gtest-port.cc          |   805 +
 third_party/gtest-1.7.0/src/gtest-printers.cc      |   363 +
 .../src/gtest-test-part.cc                         |    56 +-
 .../src/gtest-typed-test.cc                        |    27 +-
 third_party/gtest-1.7.0/src/gtest.cc               |  5015 +++++
 .../src/gtest_main.cc                              |     9 +-
 .../gtest-1.7.0/test/gtest-death-test_ex_test.cc   |    93 +
 .../test/gtest-death-test_test.cc                  |   708 +-
 .../gtest-1.7.0/test/gtest-filepath_test.cc        |   680 +
 .../gtest-1.7.0/test/gtest-linked_ptr_test.cc      |   154 +
 .../gtest-1.7.0/test/gtest-listener_test.cc        |   310 +
 .../test/gtest-message_test.cc                     |    72 +-
 third_party/gtest-1.7.0/test/gtest-options_test.cc |   215 +
 .../test/gtest-param-test2_test.cc}                |    59 +-
 .../gtest-1.7.0/test/gtest-param-test_test.cc      |   904 +
 .../test/gtest-param-test_test.h}                  |    46 +-
 third_party/gtest-1.7.0/test/gtest-port_test.cc    |  1253 ++
 .../gtest-1.7.0/test/gtest-printers_test.cc        |  1566 ++
 .../gtest-1.7.0/test/gtest-test-part_test.cc       |   208 +
 third_party/gtest-1.7.0/test/gtest-tuple_test.cc   |   320 +
 .../test/gtest-typed-test2_test.cc                 |     4 +-
 .../test/gtest-typed-test_test.cc                  |    52 +-
 .../test/gtest-typed-test_test.h                   |     6 +-
 .../gtest-1.7.0/test/gtest-unittest-api_test.cc    |   341 +
 .../test/gtest_all_test.cc}                        |    44 +-
 .../test/gtest_break_on_failure_unittest.py        |    81 +-
 .../test/gtest_break_on_failure_unittest_.cc}      |    75 +-
 .../test/gtest_catch_exceptions_test.py            |   237 +
 .../test/gtest_catch_exceptions_test_.cc           |   311 +
 .../test/gtest_color_test.py                       |    41 +-
 .../test/gtest_color_test_.cc                      |    15 +-
 .../test/gtest_env_var_test.py                     |    96 +-
 .../test/gtest_env_var_test_.cc                    |    16 +-
 .../test/gtest_environment_test.cc                 |    10 +-
 .../gtest-1.7.0/test/gtest_filter_unittest.py      |   633 +
 .../test/gtest_filter_unittest_.cc                 |    68 +-
 third_party/gtest-1.7.0/test/gtest_help_test.py    |   172 +
 .../test/gtest_help_test_.cc}                      |    25 +-
 .../gtest-1.7.0/test/gtest_list_tests_unittest.py  |   207 +
 .../gtest-1.7.0/test/gtest_list_tests_unittest_.cc |   157 +
 .../test/gtest_main_unittest.cc                    |     2 +-
 .../test/gtest_no_test_unittest.cc                 |    14 +-
 third_party/gtest-1.7.0/test/gtest_output_test.py  |   335 +
 .../test/gtest_output_test_.cc                     |   368 +-
 .../test/gtest_output_test_golden_lin.txt          |   180 +-
 .../test/gtest_pred_impl_unittest.cc               |    31 +-
 .../gtest-1.7.0/test/gtest_premature_exit_test.cc  |   141 +
 .../test/gtest_prod_test.cc                        |     2 +-
 .../test/gtest_repeat_test.cc                      |    48 +-
 third_party/gtest-1.7.0/test/gtest_shuffle_test.py |   325 +
 .../test/gtest_shuffle_test_.cc}                   |   109 +-
 .../test/gtest_sole_header_test.cc                 |     2 +-
 third_party/gtest-1.7.0/test/gtest_stress_test.cc  |   256 +
 third_party/gtest-1.7.0/test/gtest_test_utils.py   |   320 +
 .../test/gtest_throw_on_failure_ex_test.cc         |    92 +
 .../test/gtest_throw_on_failure_test.py}           |   114 +-
 .../test/gtest_throw_on_failure_test_.cc}          |    62 +-
 .../test/gtest_uninitialized_test.py               |    61 +-
 .../test/gtest_uninitialized_test_.cc              |     2 +-
 third_party/gtest-1.7.0/test/gtest_unittest.cc     |  7415 +++++++
 .../test/gtest_xml_outfile1_test_.cc               |     2 +-
 .../test/gtest_xml_outfile2_test_.cc               |     2 +-
 .../test/gtest_xml_outfiles_test.py                |    32 +-
 .../gtest-1.7.0/test/gtest_xml_output_unittest.py  |   307 +
 .../test/gtest_xml_output_unittest_.cc             |    77 +-
 .../test/gtest_xml_test_utils.py                   |   122 +-
 .../test/production.cc                             |     0
 .../test/production.h                              |     4 +-
 .../xcode/Config/DebugProject.xcconfig             |     0
 .../xcode/Config/FrameworkTarget.xcconfig          |     4 +-
 .../xcode/Config/General.xcconfig                  |     2 +-
 .../xcode/Config/ReleaseProject.xcconfig           |     0
 .../xcode/Config/StaticLibraryTarget.xcconfig      |    18 +
 .../xcode/Config/TestTarget.xcconfig               |     1 +
 .../xcode/Resources/Info.plist                     |     0
 .../xcode/Samples/FrameworkSample/Info.plist       |     0
 .../WidgetFramework.xcodeproj/project.pbxproj      |   180 +-
 .../xcode/Samples/FrameworkSample/runtests.sh      |    62 +
 .../xcode/Samples/FrameworkSample/widget.cc        |     6 +-
 .../xcode/Samples/FrameworkSample/widget.h         |     8 +-
 .../xcode/Samples/FrameworkSample/widget_test.cc   |     6 +-
 third_party/gtest-1.7.0/xcode/Scripts/runtests.sh  |    65 +
 .../xcode/Scripts/versiongenerate.py               |    35 +-
 .../xcode/gtest.xcodeproj/project.pbxproj          |  1135 ++
 third_party/uriparser-0.7.5/build-aux/ltmain.sh    |     0
 third_party/uriparser-0.7.5/doc/preprocess.sh      |     0
 .../uriparser-0.7.5/doc/rule_dependencies.sh       |     0
 .../include/uriparser/UriDefsConfig.h              |     2 +-
 third_party/uriparser-0.7.5/lib/UriIp4.c           |    10 +-
 third_party/uriparser-0.7.5/lib/UriNormalize.c     |     2 +-
 third_party/uriparser-0.7.5/lib/UriParse.c         |    18 +-
 third_party/uriparser-0.7.5/lib/UriRecompose.c     |     2 +-
 xcode/LibKML/Makefile.in                           |   377 -
 xcode/Makefile.in                                  |   574 -
 328 files changed, 91160 insertions(+), 65005 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git



More information about the Pkg-grass-devel mailing list