[postgis] 01/02: Merge commit '2c5096d72e28bb3e9464fe9724f0a4b0decefb27' into jessie-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository postgis.

commit 2e213d70eae3745374f3c41d8a9824abf045a860
Merge: f6ada53 2c5096d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 21 08:16:00 2015 +0200

    Merge commit '2c5096d72e28bb3e9464fe9724f0a4b0decefb27' into jessie-backports
    
    Conflicts:
    	debian/changelog

 ._config.guess                                     | Bin 0 -> 239 bytes
 ._config.sub                                       | Bin 0 -> 239 bytes
 ._install-sh                                       | Bin 0 -> 239 bytes
 ChangeLog                                          | 147 ++++
 NEWS                                               |  15 +
 README.postgis                                     |   4 +-
 Version.config                                     |   2 +-
 config.guess                                       |   6 +-
 config.sub                                         |  10 +-
 configure                                          | 255 ++++--
 configure.ac                                       |   2 +-
 debian/changelog                                   |  25 +
 debian/control                                     |   9 +-
 debian/control.in                                  |   9 +-
 debian/copyright                                   | 931 +++------------------
 ...wgeom-2.1.7.install => liblwgeom-2.1.8.install} |   0
 ...wgeom-2.1.7.symbols => liblwgeom-2.1.8.symbols} |   2 +-
 doc/faq_raster.xml                                 |   3 +-
 doc/introduction.xml                               |   2 +-
 doc/reference_sfcgal.xml                           |   7 +
 doc/release_notes.xml                              |  59 +-
 extensions/postgis/postgis.control                 |   2 +-
 .../postgis_tiger_geocoder.control                 |   2 +-
 .../postgis_topology/postgis_topology.control      |   2 +-
 extensions/upgradeable_versions.mk                 |  11 +-
 liblwgeom/Makefile.in                              |   1 +
 liblwgeom/cunit/cu_algorithm.c                     |  11 +-
 liblwgeom/cunit/cu_libgeom.c                       |  46 +-
 liblwgeom/cunit/cu_ptarray.c                       |   2 +-
 liblwgeom/g_serialized.c                           |  47 +-
 liblwgeom/lwgeodetic.h                             |   4 +-
 liblwgeom/lwgeodetic_tree.h                        |   2 +-
 liblwgeom/lwgeom.c                                 |   7 +-
 liblwgeom/lwgeom_geos.c                            |   4 +-
 liblwgeom/lwin_geojson.c                           |  71 +-
 liblwgeom/lwline.c                                 |   7 +-
 liblwgeom/lwlinearreferencing.c                    |  28 +-
 liblwgeom/ptarray.c                                |  10 +-
 libtool                                            | 159 +++-
 loader/shp2pgsql-core.c                            |   5 +
 loader/shp2pgsql-core.h                            |   5 +-
 ltmain.sh                                          |  81 +-
 macros/._libtool.m4                                | Bin 0 -> 239 bytes
 macros/._ltoptions.m4                              | Bin 0 -> 239 bytes
 macros/._ltsugar.m4                                | Bin 0 -> 239 bytes
 macros/._lt~obsolete.m4                            | Bin 0 -> 239 bytes
 macros/libtool.m4                                  | 171 ++--
 macros/ltoptions.m4                                |   2 +-
 macros/ltsugar.m4                                  |   2 +-
 macros/ltversion.m4                                |  12 +-
 macros/lt~obsolete.m4                              |   2 +-
 postgis/geography_btree.c                          |  32 +-
 postgis/geography_inout.c                          |   4 +-
 postgis/lwgeom_accum.c                             |  11 +-
 postgis/lwgeom_export.c                            |  42 +-
 postgis/lwgeom_functions_basic.c                   |   9 +-
 postgis/postgis.sql.in                             |  95 +--
 postgis/sqldefines.h                               |  10 +-
 postgis_svn_revision.h                             |   2 +-
 raster/test/regress/tickets.sql                    |  84 ++
 raster/test/regress/tickets_expected               |   9 +
 regress/affine.sql                                 |   3 +
 regress/affine_expected                            |   1 +
 regress/in_geojson.sql                             |  16 +
 regress/in_geojson_expected                        |  10 +
 regress/regress_lrs.sql                            |   1 +
 regress/regress_lrs_expected                       |   1 +
 67 files changed, 1292 insertions(+), 1222 deletions(-)

diff --cc debian/changelog
index 074d494,dfc12ad..1e6e595
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,28 +1,35 @@@
+ postgis (2.1.8+dfsg-1) unstable; urgency=medium
+ 
+   [ Markus Wanner ]
+   * New upstream version.
+   * Re-add libmaven-compiler-plugin-java to the B-D as an alternative, so
+     this package remains backward compatible.
+ 
+   [ Bas Couwenberg ]
+   * Update copyright years for autotools files.
+   * Update liblwgeom package name for 2.1.8 version.
+ 
+  -- Markus Wanner <markus at bluegap.ch>  Fri, 10 Jul 2015 12:51:42 +0200
+ 
+ postgis (2.1.7+dfsg-2) unstable; urgency=medium
+ 
+   * Apply patch from Ubuntu to depend on libmaven-compiler-plugin-2.5-java,
+     fixes build failure with maven-compiler-plugin 3.x.
+     (closes: #788761)
+   * Update copyright file, changes:
+     - Drop .0 from GPL license shortnames
+     - Align copyright holders
+     - Group files & copyright by license
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 14 Jun 2015 21:55:36 +0200
+ 
 +postgis (2.1.7+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf and Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 13 May 2015 18:42:39 +0200
 +
  postgis (2.1.7+dfsg-1) unstable; urgency=medium
  
    * Restore get-orig-source target, but use uscan instead of custom script.

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