[mkgmap-splitter] 01/02: Merge tag 'debian/0.0.0+svn428-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 mkgmap-splitter.

commit 3824cd0b2bec1ac364a9eb0127e762dda4fc9d49
Merge: d6de382 5904732
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 4 23:48:11 2016 +0100

    Merge tag 'debian/0.0.0+svn428-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                                 | 17 +++++++++++++
 debian/control                                   |  6 ++---
 debian/mkgmap-splitter.sh                        | 31 +++++++++++++++---------
 debian/rules                                     |  2 +-
 debian/upstream/metadata                         |  5 ++++
 resources/splitter-version.properties            |  4 +--
 src/uk/me/parabola/splitter/BinaryMapWriter.java | 10 +++++++-
 7 files changed, 57 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index 8635ac8,81eb6e4..9385fd4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ mkgmap-splitter (0.0.0+svn428-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump Standards-Version to 3.9.7, no changes.
+   * Enable parallel builds.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Feb 2016 11:21:29 +0100
+ 
+ mkgmap-splitter (0.0.0+svn427-2) unstable; urgency=medium
+ 
+   * Update Vcs-Browser URL to use HTTPS.
+   * Add upstream metadata.
+   * Add support for OpenJDK 8 in mkgmap-splitter wrapper script.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 01 Nov 2015 12:29:08 +0100
+ 
 +mkgmap-splitter (0.0.0+svn427-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Aug 2015 15:15:51 +0200
 +
  mkgmap-splitter (0.0.0+svn427-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 5fae52c,f61d939..6a528d5
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mkgmap-splitter.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap-splitter.git -b jessie-backports
+ Standards-Version: 3.9.7
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap-splitter.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap-splitter.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap-splitter.git -b jessie-backports
  Homepage: http://www.mkgmap.org.uk/doc/splitter.html
  
  Package: mkgmap-splitter

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