[postgis] 02/02: Merge branch 'upstream', actually giving us postgis-2.1.2.

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository postgis.

commit f37d27762f897ed5b59467cdcfd7abb39db54dc6
Merge: 89459f7 e0c5fb3
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon Mar 31 09:40:11 2014 +0200

    Merge branch 'upstream', actually giving us postgis-2.1.2.

 .travis.yml                                        |  27 +-
 ChangeLog                                          | 523 +++++++++++++++++++++
 NEWS                                               |  40 ++
 README.postgis                                     |   4 +-
 Version.config                                     |   2 +-
 aclocal.m4                                         |   2 +-
 configure                                          |  20 +-
 configure.ac                                       |  11 +-
 doc/Makefile                                       |  24 +-
 doc/Makefile.comments                              |   4 +-
 doc/Makefile.in                                    |  10 +-
 doc/extras_topology.xml                            | 118 ++++-
 doc/faq.xml                                        |  11 +-
 doc/html/image_src/Makefile                        |   4 +-
 doc/postgis.xml                                    |   4 +-
 doc/postgis_comments.sql                           |  20 +-
 doc/reference_constructor.xml                      |  32 +-
 doc/reference_measure.xml                          |   2 +-
 doc/release_notes.xml                              |  36 ++
 doc/topology_comments.sql                          |   4 +
 doc/using_postgis_dataman.xml                      |  25 +-
 doc/using_raster_dataman.xml                       |   5 +-
 extensions/postgis/META.json                       |   2 +-
 extensions/postgis/Makefile.in                     |  38 +-
 extensions/postgis/doc/postgis.md                  |   5 +-
 extensions/postgis/postgis.control                 |   2 +-
 .../postgis/sql_bits/postgis--unpackaged.sql.in    |   1 +
 .../postgis/sql_bits/remove_from_extension.sql.in  |   4 +-
 extensions/postgis_extension_helper.sql            |   4 +-
 extensions/postgis_extension_helper_uninstall.sql  |   4 +-
 extensions/postgis_tiger_geocoder/META.json        |   2 +-
 extensions/postgis_tiger_geocoder/Makefile.in      |   6 +
 .../doc/postgis_tiger_geocoder.md                  |   5 +-
 .../postgis_tiger_geocoder.control                 |   2 +-
 .../sql_bits/remove_from_extension.sql.in          |   2 +-
 .../sql_bits/tiger_geocoder--unpackaged.sql.in     |   1 +
 extensions/postgis_topology/META.json              |   2 +-
 extensions/postgis_topology/doc/postgis.md         |   5 +-
 .../postgis_topology/postgis_topology.control      |   2 +-
 .../sql_bits/remove_from_extension.sql.in          |   4 +-
 .../sql_bits/topology--unpackaged.sql.in           |   1 +
 extensions/upgradeable_versions.mk                 |  17 +-
 java/jdbc/Makefile                                 |   2 +-
 java/jdbc/jtssrc/pom.xml                           |   2 +-
 java/jdbc/pom.xml                                  |   2 +-
 java/jdbc/src/org/postgis/GeometryCollection.java  |   8 +-
 liblwgeom/cunit/cu_geodetic.c                      |  42 +-
 liblwgeom/cunit/cu_tree.c                          |  18 +
 liblwgeom/g_box.c                                  |  19 +-
 liblwgeom/lwgeodetic.c                             |  47 +-
 liblwgeom/lwgeodetic.h                             |  15 +-
 liblwgeom/lwgeodetic_tree.c                        | 383 ++++++++++-----
 liblwgeom/lwgeodetic_tree.h                        |   3 +
 liblwgeom/lwin_geojson.c                           |  88 ++--
 libtool                                            |  20 +-
 postgis/geography_measurement_trees.c              | 197 ++++----
 postgis/gserialized_estimate.c                     |  12 +-
 postgis/gserialized_gist_2d.c                      |  10 +-
 postgis/lwgeom_in_gml.c                            |   6 +-
 postgis/postgis.sql.in                             |  22 +-
 postgis/sqldefines.h                               |   8 +-
 postgis_svn_revision.h                             |   2 +-
 raster/doc/RFC1-SerializedFormat                   |   2 +-
 raster/doc/RFC2-WellKnownBinaryFormat              |   2 +-
 raster/rt_core/rt_api.c                            |  41 +-
 raster/rt_core/rt_api.h                            |   4 +-
 raster/rt_pg/Makefile.in                           |  12 +-
 raster/rt_pg/rt_pg.c                               |  30 +-
 raster/rt_pg/rtpostgis.sql.in                      |  36 +-
 raster/test/regress/rt_asjpeg.sql                  |   1 +
 raster/test/regress/rt_asjpeg_expected             |   1 +
 raster/test/regress/rt_aspng.sql                   |   1 +
 raster/test/regress/rt_aspng_expected              |   1 +
 raster/test/regress/rt_astiff.sql                  |   2 +
 raster/test/regress/rt_astiff_expected             |   2 +
 raster/test/regress/rt_reclass.sql                 |  25 +
 raster/test/regress/rt_reclass_expected            |   1 +
 regress/empty.sql                                  |   6 +-
 regress/in_geojson.sql                             |   3 +
 regress/in_geojson_expected                        |   1 +
 regress/in_gml.sql                                 |   2 +
 regress/in_gml_expected                            |   1 +
 regress/legacy.sql                                 |   6 +-
 regress/loader/ReprojectPts-pre.sql                |   2 +
 regress/regress_ogc.sql                            | 128 ++---
 regress/regress_proj.sql                           |   2 +-
 regress/run_test.pl                                |  67 ++-
 regress/sql-mm-curvepoly.sql                       |   6 +-
 regress/sql-mm-curvepoly_expected                  |   4 +-
 regress/tickets.sql                                |  13 +-
 regress/tickets_expected                           |   2 +
 topology/sql/export/TopoJSON.sql.in                |   2 +-
 topology/sql/populate.sql.in                       |   8 +-
 topology/sql/sqlmm.sql.in                          |  29 +-
 topology/sql/topoelement/topoelement_agg.sql.in    |   1 +
 topology/sql/topogeometry/simplify.sql.in          |   2 +-
 topology/test/Makefile                             |   2 +-
 topology/test/regress/st_createtopogeo.sql         |   1 +
 topology/test/regress/st_simplify.sql              |  32 +-
 topology/test/regress/st_simplify_expected         |   3 +
 utils/postgis_proc_upgrade.pl                      |  76 ++-
 101 files changed, 1889 insertions(+), 614 deletions(-)

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