[mkgmap-splitter] 01/02: Merge tag 'debian/0.0.0+svn427-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 dbd7ba22a76d7812934d399be313e52b383715f9
Merge: 5c8c031 bf593d5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 22 15:15:47 2015 +0200

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

 debian/changelog                                       | 6 ++++++
 debian/watch                                           | 3 ++-
 resources/splitter-version.properties                  | 4 ++--
 src/uk/me/parabola/splitter/SplittableDensityArea.java | 9 ++++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index f4a14c0,3b27ff1..90cbf49
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mkgmap-splitter (0.0.0+svn427-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 14 Aug 2015 11:32:43 +0200
+ 
 +mkgmap-splitter (0.0.0+svn426-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 03 Jul 2015 17:04:01 +0200
 +
  mkgmap-splitter (0.0.0+svn426-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.

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