[osmctools] 01/02: Merge tag 'debian/0.6-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 osmctools.

commit df7313dec166de7d44434506b8ff60e48f865c21
Merge: 0be2d1a 4ff1ff7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 20 17:21:28 2016 +0100

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

 debian/changelog                   |  13 +
 debian/control                     |   8 +-
 debian/copyright                   |   2 +-
 debian/docs/osmconvert.1           |  14 +-
 debian/docs/osmupdate.1            |   2 +-
 debian/patches/allow-to-typo.patch |  16 --
 debian/patches/ld-as-needed.patch  |  18 --
 debian/patches/series              |   2 -
 debian/rules                       |   2 +-
 debian/watch                       |   5 +-
 src/Makefile.am                    |   4 +-
 src/osmconvert.c                   | 495 ++++++++++++++++++++++++++++++++++---
 src/osmupdate.c                    |   9 +-
 13 files changed, 509 insertions(+), 81 deletions(-)

diff --cc debian/changelog
index 5c0be0a,1dfd4ac..a8d7b4e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,23 @@@
+ osmctools (0.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update copyright years for Markus Weber.
+   * Update man pages for upstream changes.
+   * Drop patches, applied upstream.
+   * Update Vcs-* URLs to use HTTPS.
+   * Bump Standards-Version to 3.9.7, no changes.
+   * Enable parallel builds.
+   * Handle common issues in watch file.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 15 Feb 2016 07:14:32 +0100
+ 
 +osmctools (0.5-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>  Tue, 05 May 2015 15:30:05 +0200
 +
  osmctools (0.5-1) unstable; urgency=medium
  
    * Move from experimental to unstable.
diff --cc debian/control
index 833d07c,7451c5c..2f3611f
--- a/debian/control
+++ b/debian/control
@@@ -4,12 -4,12 +4,12 @@@ Uploaders: Pierre Blanc <pierreblanc75@
             Bas Couwenberg <sebastic at debian.org>
  Section: utils
  Priority: optional
- Build-Depends: debhelper (>= 9.0.0),
+ Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
                 zlib1g-dev
- Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmctools.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/osmctools.git -b jessie-backports
+ Standards-Version: 3.9.7
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmctools.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmctools.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmctools.git -b jessie-backports
  Homepage: https://gitlab.com/osm-c-tools/osmctools
  
  Package: osmctools

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