[osm2pgsql] 01/02: Merge tag 'debian/0.88.1-1' 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 osm2pgsql.

commit b45ea1ce0d4694b32f157c997a270c05338208d0
Merge: 10b4146 921d8ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 7 08:30:43 2015 +0200

    Merge tag 'debian/0.88.1-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 configure.ac              |  2 +-
 debian/changelog          |  8 ++++++++
 debian/control            |  2 +-
 debian/watch              |  4 ++--
 docs/osm2pgsql.1          |  2 +-
 geometry-builder.cpp      |  2 +-
 id-tracker.cpp            |  2 ++
 id-tracker.hpp            |  1 +
 node-persistent-cache.cpp |  7 ++++---
 node-ram-cache.hpp        |  2 +-
 output-multi.cpp          | 36 ++++++++++++++++++++++++++----------
 output-pgsql.cpp          | 40 ++++++++++++++++++++++++++++------------
 table.cpp                 |  2 ++
 13 files changed, 78 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index fbb7c27,ef1bf75..fcbb85f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ osm2pgsql (0.88.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update watch file to handle other tar extensions.
+   * Update Vcs-Browser URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Aug 2015 11:51:55 +0200
+ 
 +osm2pgsql (0.88.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 20 Jul 2015 09:09:41 +0200
 +
  osm2pgsql (0.88.0-1) unstable; urgency=medium
  
    * Fix filenamemangle in watch file for non pre-releases.
diff --cc debian/control
index b375112,5ad95c4..3578a09
--- a/debian/control
+++ b/debian/control
@@@ -26,8 -26,8 +26,8 @@@ Build-Depends: debhelper (>= 9)
                 python,
                 python-psycopg2
  Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osm2pgsql.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osm2pgsql.git
 -Vcs-Git: git://anonscm.debian.org/pkg-grass/osm2pgsql.git
 +Vcs-Git: git://anonscm.debian.org/pkg-grass/osm2pgsql.git -b jessie-backports
  Homepage: http://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