[osm2pgsql] 01/02: Merge tag 'debian/0.92.0+ds-2' into jessie-backports

[Bas Couwenberg]

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

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

commit 5a70f8fdf6d3a00b5252ce81054792840681b811
Merge: aad08f6 16ecb7a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 19 07:31:41 2017 +0200

    Merge tag 'debian/0.92.0+ds-2' into jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 15 ++++++++++++
 ...e-logic-for-queuing-pending-ways-with-mul.patch | 27 ++++++++++++++++++++++
 ...nore-relations-with-more-than-32k-members.patch | 20 ++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 64 insertions(+)

diff --cc debian/changelog
index 75b07a1,5b1999d..b888423
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
+ osm2pgsql (0.92.0+ds-2) unstable; urgency=medium
+ 
+   * Add upstream patches from 0.92.x branch to fix two important issues:
+     - Ignore relations with more than 32k members.
+       There is a hard restriction in the pgsql middle tables, where
+       relation members are indexed using a smallint. To remain
+       consistent, drop all relations which exceed this size.
+       https://github.com/openstreetmap/osm2pgsql/issues/713
+     - Use the same logic for queuing pending ways with multi and pgsql.
+       Fixes ways disappearing from the output table.
+       https://github.com/openstreetmap/osm2pgsql/issues/735
+     (closes: #860273)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 13 Apr 2017 23:00:11 +0200
+ 
 +osm2pgsql (0.92.0+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 30 Dec 2016 10:14:22 +0100
 +
  osm2pgsql (0.92.0+ds-1) unstable; urgency=medium
  
    * New upstream release.

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