[mkgmap] branch master updated (d30d796 -> 50dbffa)

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch master
in repository mkgmap.

      from  d30d796   Set distribution to experimental.
       new  e042a28   Imported Upstream version 0.0.0+svn3478
       new  eb2a811   Merge tag 'upstream/0.0.0+svn3478'
       new  f5cefff   New upstream SVN snapshot.
       new  50dbffa   Set distribution to experimental.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                                   |   6 +
 resources/help/en/options                          |  10 ++
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/name                  |   8 +
 resources/styles/default/lines                     |   3 +-
 .../parabola/imgfmt/app/labelenc/Utf8Decoder.java  |   1 -
 src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java       |  14 +-
 src/uk/me/parabola/imgfmt/app/mdr/Mdr22.java       |   2 +-
 src/uk/me/parabola/imgfmt/app/mdr/Mdr2x.java       |  41 +++--
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java        | 183 +++++++++++++++++++--
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7Record.java  |  43 +++++
 src/uk/me/parabola/imgfmt/app/mdr/MdrConfig.java   |   9 +
 .../parabola/mkgmap/combiners/GmapsuppBuilder.java |   4 +-
 .../me/parabola/mkgmap/combiners/MdrBuilder.java   |   4 +-
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |  38 +++--
 .../me/parabola/mkgmap/scan/SyntaxException.java   |   2 +-
 test/resources/rules/multi-or-twice.test           |  18 ++
 test/resources/rules/multi-or-with-and.test        |  19 +++
 test/resources/rules/or-at-end.test                |  30 ++++
 .../mkgmap/osmstyle/RuleFileReaderTest.java        |   1 +
 20 files changed, 382 insertions(+), 58 deletions(-)
 create mode 100644 test/resources/rules/multi-or-twice.test
 create mode 100644 test/resources/rules/multi-or-with-and.test
 create mode 100644 test/resources/rules/or-at-end.test

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