[mkgmap-splitter] 01/02: Merge tag 'debian/0.0.0+svn426-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 f3cebc3becaecea3a379fef8b7ba8666db6fbbfa
Merge: db6c4da c8a3f6c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 3 17:03:55 2015 +0200

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

 debian/changelog                      | 7 +++++++
 debian/watch                          | 4 ++--
 doc/splitter.1.xml                    | 3 ++-
 resources/splitter-version.properties | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index a673242,edd7661..6ec6631
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
+ mkgmap-splitter (0.0.0+svn426-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Downgrade minimum testng dependency version from 6.8.13 to 6.8.8.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Jun 2015 13:21:41 +0200
+ 
 +mkgmap-splitter (0.0.0+svn425-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf and Vcs-Git URL.
 +  * Downgrade minimum testng dependency version from 6.8.13 to 6.8.8.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 Jun 2015 07:51:57 +0200
 +
  mkgmap-splitter (0.0.0+svn425-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