[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3676-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 3d32d5a91cdfdb236f6347ab92015bccd6875bab
Merge: bb20d49 287251f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 9 09:07:49 2016 +0200

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

 debian/changelog                                   |  7 ++++
 debian/control                                     |  2 +-
 doc/options.txt                                    |  5 +--
 doc/styles/internal-tags.txt                       |  2 +-
 resources/help/en/options                          |  6 ++--
 resources/mkgmap-version.properties                |  4 +--
 resources/styles/default/lines                     | 18 +++++-----
 src/uk/me/parabola/mkgmap/main/StyleTester.java    | 16 +++++++++
 src/uk/me/parabola/mkgmap/osmstyle/ActionRule.java |  5 +++
 .../parabola/mkgmap/osmstyle/ExpressionRule.java   |  5 +++
 src/uk/me/parabola/mkgmap/osmstyle/RuleSet.java    | 19 +++++++++++
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  6 +++-
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 38 ++++++++++++++--------
 src/uk/me/parabola/mkgmap/reader/osm/Rule.java     |  2 ++
 14 files changed, 101 insertions(+), 34 deletions(-)

diff --cc debian/changelog
index 3198b6c,b30b451..942b90b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3676-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Bump Standards-Version to 3.9.8, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 04 May 2016 08:46:20 +0200
+ 
 +mkgmap (0.0.0+svn3674-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Apr 2016 18:49:10 +0200
 +
  mkgmap (0.0.0+svn3674-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index a4e27de,d928c2b..5652c86
--- a/debian/control
+++ b/debian/control
@@@ -14,9 -14,9 +14,9 @@@ Build-Depends: debhelper (>= 9)
                 libfastutil-java,
                 libprotobuf-java,
                 libosmpbf-java
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap.git -b jessie-backports
  Homepage: http://www.mkgmap.org.uk
  
  Package: mkgmap

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