[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3674-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 7afa35b48da38b7c9b724eb21290c4ea156fde5c
Merge: 34bb275 cd59c11
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 8 18:49:06 2016 +0200

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

 .idea/ant.xml                                      |  3 +-
 .idea/modules.xml                                  |  3 +-
 build.xml                                          |  2 +-
 debian/changelog                                   |  6 ++
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/inc/water_lines           |  3 +
 src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java     |  3 -
 src/uk/me/parabola/imgfmt/app/mdr/Mdr1.java        | 31 ---------
 src/uk/me/parabola/imgfmt/app/mdr/Mdr10.java       |  9 ---
 src/uk/me/parabola/imgfmt/app/mdr/Mdr11.java       |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr2x.java       |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java        |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr6.java        |  4 --
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java        |  4 --
 .../me/parabola/imgfmt/app/mdr/MdrMapSection.java  | 23 ------
 .../me/parabola/mkgmap/combiners/MdrBuilder.java   |  7 +-
 src/uk/me/parabola/mkgmap/main/Main.java           | 81 +++++++++++++++-------
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |  9 ++-
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 12 ++--
 .../mkgmap/sea/optional/PrecompSeaGenerator.java   | 35 ++++------
 .../mkgmap/osmstyle/RuleFileReaderTest.java        | 21 ++++++
 21 files changed, 121 insertions(+), 151 deletions(-)

diff --cc debian/changelog
index be3b92b,b9bd8bf..683b6d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mkgmap (0.0.0+svn3674-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 00:39:48 +0200
+ 
 +mkgmap (0.0.0+svn3668-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 06 Mar 2016 17:45:18 +0100
 +
  mkgmap (0.0.0+svn3668-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