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

commit 1f2e35cc1db5e4f27d10e6e6e06b8fa46cce580f
Merge: 9c0f0ab 46f6ba1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Oct 8 10:37:10 2015 +0200

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

 debian/changelog                                   |  7 ++++++
 debian/rules                                       |  3 ++-
 doc/options.txt                                    |  3 ++-
 resources/help/en/options                          |  1 +
 resources/mkgmap-version.properties                |  4 ++--
 resources/styles/default/lines                     |  6 +++--
 resources/styles/default/points                    |  4 ++--
 src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java  |  2 +-
 src/uk/me/parabola/imgfmt/app/mdr/Mdr12Record.java |  1 -
 src/uk/me/parabola/log/UsefulFormatter.java        |  1 -
 .../parabola/mkgmap/osmstyle/WrongAngleFixer.java  |  1 +
 src/uk/me/parabola/mkgmap/reader/dem/DEM.java      |  4 ++--
 .../parabola/mkgmap/reader/osm/ElementSaver.java   | 26 +++++++++-------------
 .../mkgmap/reader/osm/OsmReadingHooksChain.java    |  1 -
 .../mkgmap/reader/osm/boundary/BoundarySaver.java  |  3 ---
 15 files changed, 35 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index 7b89a41,862d821..9ffc743
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3643-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Enable parallel builds.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 02 Oct 2015 12:51:25 +0200
+ 
 +mkgmap (0.0.0+svn3639-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 Sep 2015 08:13:33 +0200
 +
  mkgmap (0.0.0+svn3639-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.git