[osm2pgsql] 01/02: Merge tag 'debian/0.90.1+ds-1' 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 2917269eafee197243b81b6263aa3387b0ee413b
Merge: c8c948b 425f285
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 23 18:55:15 2016 +0200

    Merge tag 'debian/0.90.1+ds-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt           |  2 +-
 TODO                     | 18 ------------------
 debian/changelog         | 24 ++++++++++++++++++++++++
 debian/control           |  2 +-
 debian/docs              |  1 -
 debian/lintian-overrides |  3 ---
 debian/rules             |  5 ++++-
 default.style            |  1 -
 pgsql.cpp                |  2 +-
 processor-line.cpp       |  7 ++++++-
 processor-line.hpp       |  1 +
 reprojection.cpp         |  8 +++++---
 style.lua                |  2 +-
 table.cpp                |  2 +-
 14 files changed, 45 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index ce8b752,9024ce5..e93d21d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,33 @@@
+ osm2pgsql (0.90.1+ds-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches, included upstream.
+   * Drop TODO from docs, removed upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 17 Jul 2016 13:38:11 +0200
+ 
+ osm2pgsql (0.90.0+ds-3) unstable; urgency=medium
+ 
+   * Bump Standards-Version to 3.9.8, no changes.
+   * Drop unused override for spelling error false positive.
+   * Add upstream patch to fix projection info for generic projection.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 May 2016 22:07:00 +0200
+ 
+ osm2pgsql (0.90.0+ds-2) unstable; urgency=medium
+ 
+   * Enable all hardening buildflags.
+   * Add upstream patch to fix segfault due to null pointers in error messages.
+     (closes: #819713)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Apr 2016 23:21:43 +0200
+ 
 +osm2pgsql (0.90.0+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 09 Mar 2016 00:42:07 +0100
 +
  osm2pgsql (0.90.0+ds-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 43bf7c3,d714852..0c8013b
--- a/debian/control
+++ b/debian/control
@@@ -23,9 -23,9 +23,9 @@@ Build-Depends: debhelper (>= 9)
                 lua5.2,
                 python,
                 python-psycopg2
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osm2pgsql.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osm2pgsql.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osm2pgsql.git -b jessie-backports
  Homepage: https://wiki.openstreetmap.org/wiki/Osm2pgsql
  
  Package: osm2pgsql

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