[routino] 02/03: Merge tag 'upstream/2.7.2'

[Uwe Steinmann]

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

steinm-guest pushed a commit to branch master
in repository routino.

commit 219d803312fa24bc82cd2b8c03d00e27b5271670
Merge: cc44ea0 615634a
Author: Uwe Steinmann <steinm at debian.org>
Date:   Thu Oct 30 06:39:11 2014 +0100

    Merge tag 'upstream/2.7.2'
    
    Upstream version 2.7.2

 ChangeLog                                          | 350 +++++++++++++++++++++
 doc/INSTALL.txt                                    |  17 +-
 doc/NEWS.txt                                       |  61 +++-
 doc/README.txt                                     |   9 +-
 doc/TAGGING.txt                                    |  14 +-
 doc/USAGE.txt                                      |   3 +-
 doc/html/installation.html                         |  16 +-
 doc/html/readme.html                               |  82 ++++-
 doc/html/tagging.html                              |  25 +-
 doc/html/usage.html                                |   4 +-
 src/cache.h                                        |   4 +-
 src/errorlogx.c                                    |   2 +-
 src/fakes.c                                        |  29 +-
 src/fakes.h                                        |   4 +-
 src/filedumper.c                                   |  24 +-
 src/optimiser.c                                    | 108 ++++---
 src/osmparser.c                                    |  21 +-
 src/output.c                                       | 126 ++++++--
 src/prunex.c                                       |  35 ++-
 src/router.c                                       | 194 +++++++-----
 src/segments.c                                     |   2 +-
 src/segments.h                                     |   6 +-
 src/superx.c                                       |  24 +-
 src/test/Makefile                                  |   2 +-
 src/test/a-b-c-d.sh                                | 105 +++++++
 src/test/coincident-waypoint.osm                   | 101 ++++++
 src/test/coincident-waypoint.sh                    |   1 +
 src/test/cycle-both-ways.osm                       | 107 +++++++
 src/test/cycle-both-ways.sh                        |   1 +
 src/test/cycle-drive.sh                            | 105 +++++++
 src/test/expected/coincident-waypoint-WP01.txt     |  12 +
 src/test/expected/coincident-waypoint-WP02.txt     |  11 +
 src/test/expected/coincident-waypoint-WP03.txt     |  12 +
 src/test/expected/coincident-waypoint-WP04.txt     |  10 +
 src/test/expected/cycle-both-ways-WP01.txt         |  16 +
 src/test/expected/cycle-both-ways-WP02.txt         |  16 +
 src/test/expected/fake-node-with-loop-WP01.txt     |  19 ++
 src/test/expected/fake-node-with-loop-WP02.txt     |  18 ++
 src/test/expected/loops-WP01.txt                   |  11 +-
 src/test/expected/loops-WP02.txt                   |  13 +-
 src/test/expected/loops-WP06.txt                   |   9 +-
 src/test/expected/loops-WP07.txt                   |  11 +-
 src/test/expected/roundabout-waypoints-WP01.txt    |  12 +
 src/test/expected/roundabout-waypoints-WP02.txt    |  13 +
 src/test/expected/roundabout-waypoints-WP03.txt    |  12 +
 src/test/expected/roundabout-waypoints-WP04.txt    |  13 +
 src/test/expected/roundabout-waypoints-WP05.txt    |  12 +
 src/test/expected/roundabout-waypoints-WP06.txt    |  13 +
 src/test/expected/roundabout-waypoints-WP07.txt    |  12 +
 src/test/fake-node-with-loop.osm                   | 102 ++++++
 src/test/fake-node-with-loop.sh                    |   1 +
 src/test/prune-straight.osm                        |   2 +-
 src/test/roundabout-waypoints.osm                  | 105 +++++++
 src/test/roundabout-waypoints.sh                   |   1 +
 src/types.c                                        |  10 +-
 src/types.h                                        |  13 +-
 src/visualiser.c                                   |  76 ++---
 src/visualiser.h                                   |   4 +-
 web/Makefile                                       |  24 +-
 web/translations/router.html                       |  22 +-
 web/translations/translate.pl                      | 235 +++++++++-----
 web/translations/translation.de.txt                | 168 +++++++++-
 web/translations/translation.en.txt                | 111 ++++++-
 web/translations/translation.fr.txt                | 112 ++++++-
 web/translations/translation.nl.txt                |  99 +++++-
 web/translations/translation.ru.txt                | 168 ++++++++++
 web/translations/translations-body.xml             |  93 ++++++
 web/translations/translations-head.xml             |  18 ++
 web/translations/translations-tail.xml             |   1 +
 web/translations/visualiser.html                   |  64 ++--
 web/www/routino/router.css                         |  26 +-
 web/www/routino/router.html.de                     | 162 +++++-----
 web/www/routino/router.html.en                     |   8 +-
 web/www/routino/router.html.fr                     | 184 +++++------
 web/www/routino/router.html.nl                     |  16 +-
 web/www/routino/{router.html.en => router.html.ru} |  70 ++---
 web/www/routino/router.leaflet.js                  |  52 ++-
 web/www/routino/router.openlayers.js               |  52 ++-
 web/www/routino/search.cgi                         |   2 +-
 web/www/routino/search.pl                          |   5 +-
 web/www/routino/visualiser.cgi                     |   5 +-
 web/www/routino/visualiser.html.de                 | 108 ++++---
 web/www/routino/visualiser.html.en                 |  32 +-
 web/www/routino/visualiser.html.fr                 |  56 ++--
 web/www/routino/visualiser.html.nl                 |  32 +-
 .../{visualiser.html.en => visualiser.html.ru}     | 110 ++++---
 web/www/routino/visualiser.leaflet.js              |  18 +-
 web/www/routino/visualiser.openlayers.js           |  18 +-
 xml/routino-profiles.xml                           |  10 -
 xml/routino-translations.xml                       | 176 +++++------
 xml/scripts/drive.pl                               |   7 +-
 xml/scripts/walk.pl                                |   3 +-
 92 files changed, 3454 insertions(+), 954 deletions(-)

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