[merkaartor] branch upstream updated (e920a8f -> 44d208a)

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Jun 6 20:54:47 UTC 2016


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

sebastic pushed a change to branch upstream
in repository merkaartor.

      from  e920a8f   Imported Upstream version 0.18.2
       new  44d208a   Imported Upstream version 0.18.3~rc1

The 1 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:
 .drone.sec                                         |    1 +
 .drone.yml                                         |   30 +
 .travis.yml                                        |   37 +-
 .tx/config                                         |    9 +
 3rdparty/quazip-0.7/NEWS.txt                       |    2 +-
 3rdparty/quazip-0.7/doc/html/classQuaZip.html      |    2 +-
 .../doc/html/structQuaZipFileInfo64.html           |    2 +-
 3rdparty/quazip-0.7/doc/latex/classQuaZip.tex      |    2 +-
 .../doc/latex/structQuaZipFileInfo64.tex           |    2 +-
 3rdparty/quazip-0.7/quazip/quazip.h                |    2 +-
 3rdparty/quazip-0.7/quazip/quazipfile.cpp          |    2 +-
 AUTHORS                                            |    9 +-
 CHANGELOG                                          |   88 +-
 COMPILE.md                                         |  222 +
 HACKING                                            |   11 -
 HACKING.md                                         |   61 +
 INSTALL                                            |  137 -
 Icons/128x128/merkaartor.png                       |  Bin 0 -> 33958 bytes
 Icons/16x16/merkaartor.png                         |  Bin 0 -> 1030 bytes
 Icons/192x192/merkaartor.png                       |  Bin 0 -> 68817 bytes
 Icons/22x22/merkaartor.png                         |  Bin 0 -> 1624 bytes
 Icons/24x24/merkaartor.png                         |  Bin 0 -> 1849 bytes
 Icons/256x256/merkaartor.png                       |  Bin 0 -> 113391 bytes
 Icons/32x32/merkaartor.png                         |  Bin 0 -> 2972 bytes
 Icons/36x36/merkaartor.png                         |  Bin 0 -> 3640 bytes
 Icons/40x40/merkaartor.png                         |  Bin 0 -> 4364 bytes
 Icons/42x42/merkaartor.png                         |  Bin 0 -> 4746 bytes
 Icons/512x512/merkaartor.png                       |  Bin 0 -> 384401 bytes
 Icons/64x64/merkaartor.png                         |  Bin 0 -> 10057 bytes
 Icons/72x72/merkaartor.png                         |  Bin 0 -> 12385 bytes
 Icons/80x80/merkaartor.png                         |  Bin 0 -> 14910 bytes
 Icons/8x8/merkaartor.png                           |  Bin 0 -> 555 bytes
 Icons/96x96/merkaartor.png                         |  Bin 0 -> 20628 bytes
 README.md                                          |   45 +
 Styles/{MapnikPlus.mas => Merkaartor.mas}          |  379 +-
 TODO                                               |    5 -
 ci/travis-linux-install.sh                         |   13 +
 ci/travis-linux-script.sh                          |    6 +
 ci/travis-osx-install.sh                           |   27 +
 ci/travis-osx-script.sh                            |   46 +
 interfaces/IImageManager.h                         |    4 +-
 .../MCadastreFranceBackground/CadastreFrance.cpp   |    2 +-
 .../MCadastreFranceBackground/CadastreFrance.h     |    2 +-
 plugins/background/MGdalBackground/GdalAdapter.cpp |    2 +-
 plugins/background/MGdalBackground/GdalAdapter.h   |    6 +-
 .../MGeoTiffBackground/GeoTiffAdapter.cpp          |    2 +-
 .../background/MGeoTiffBackground/GeoTiffAdapter.h |    6 +-
 .../MGosmoreBackground/GosmoreAdapter.cpp          |    5 +-
 .../background/MGosmoreBackground/GosmoreAdapter.h |    8 +-
 .../MMsBingMapBackground/msbingmapadapter.h        |    4 +-
 .../background/MNavitBackground/NavitAdapter.cpp   |    2 +-
 plugins/background/MNavitBackground/NavitAdapter.h |    8 +-
 plugins/background/MNavitBackground/NavitBin.cpp   |    5 +-
 plugins/background/MNavitBackground/NavitZip.cpp   |    6 +-
 .../MSpatialiteBackground/SpatialiteAdapter.cpp    |    4 +-
 .../MSpatialiteBackground/SpatialiteAdapter.h      |   10 +-
 .../WalkingPapersAdapter.cpp                       |    4 +-
 .../WalkingPapersAdapter.h                         |    8 +-
 .../MYahooBackground/yahoolegalmapadapter.cpp      |    4 +-
 .../MYahooBackground/yahoolegalmapadapter.h        |    6 +-
 .../MYahooTiledBackground/yahootiledmapadapter.cpp |    4 +-
 .../MYahooTiledBackground/yahootiledmapadapter.h   |    6 +-
 plugins/common.pri                                 |    4 +
 share/Projections.xml                              |    3 +-
 share/TmsServersList.xml                           |   15 +-
 share/WmsServersList.xml                           |   17 +-
 src/Backend/MemoryBackend.cpp                      |  153 +-
 src/Backend/MemoryBackend.h                        |    3 +
 src/Commands/Command.cpp                           |   10 +-
 src/Config.pri                                     |   16 +-
 src/Docks/DirtyDock.ui                             |    6 +-
 src/Docks/FeaturesDock.cpp                         |   57 +-
 src/Docks/FeaturesDock.h                           |    4 +-
 src/Docks/FeaturesDock.ui                          |   51 +-
 src/Docks/GeoImageDock.cpp                         |   20 +-
 src/Docks/GeoImageDock.h                           |    9 +-
 src/Docks/PropertiesDock.cpp                       |    8 +-
 src/Docks/PropertiesDock.h                         |    7 +-
 src/Features/Feature.cpp                           |    6 +-
 src/Features/Feature.h                             |   10 +-
 src/Features/Node.cpp                              |    4 +-
 src/Features/Node.h                                |    2 +-
 src/Features/Relation.h                            |    2 +-
 src/Features/TrackSegment.h                        |    4 +-
 src/Features/Way.cpp                               |   10 +-
 src/Features/Way.h                                 |    2 +-
 src/GPS/qgpsdevice.cpp                             |    7 +
 src/ImportExport/ImportCSVDialog.cpp               |    8 +-
 src/ImportExport/ImportCSVDialog.ui                |   16 +-
 src/ImportExport/ImportExportGdal.cpp              |   10 +-
 src/ImportExport/ImportExportOSC.cpp               |    2 +-
 src/ImportExport/ImportNMEA.cpp                    |    5 +-
 src/Interactions/CreateNodeInteraction.cpp         |    2 +-
 src/Interactions/CreateRoundaboutDock.ui           |   94 +-
 src/Interactions/CreateRoundaboutInteraction.cpp   |   97 +-
 src/Interactions/CreateRoundaboutInteraction.h     |    4 +
 src/Interactions/Interaction.cpp                   |   87 +-
 src/Interactions/Interaction.h                     |   21 +-
 src/Interactions/MoveNodeInteraction.cpp           |    1 +
 src/Interactions/RotateInteraction.h               |    2 +-
 src/Layers/ImageMapLayer.cpp                       |   38 +-
 src/Layers/Layer.cpp                               |    6 +-
 src/Layers/Layer.h                                 |    6 +-
 src/Layers/OsmRenderLayer.cpp                      |   18 +-
 src/Layers/OsmRenderLayer.h                        |    3 +
 src/Main.cpp                                       |   63 +-
 src/MainWindow.cpp                                 |  406 +-
 src/MainWindow.h                                   |    9 +-
 src/MainWindow.ui                                  |  351 +-
 src/PaintStyle/FeaturePainter.cpp                  |   12 +-
 src/PaintStyle/Painter.cpp                         |    2 +-
 src/PaintStyle/PrimitivePainter.cpp                |    4 +-
 src/Preferences/BookmarksList.cpp                  |    2 +-
 src/Preferences/MerkaartorPreferences.cpp          |   87 +-
 src/Preferences/MerkaartorPreferences.h            |    4 +
 src/Preferences/TMSPreferencesDialog.cpp           |   10 +-
 src/Preferences/TMSPreferencesDialog.ui            |   13 +-
 src/Preferences/TmsServersList.cpp                 |    6 +-
 src/Preferences/TmsServersList.h                   |    2 +-
 src/Preferences/WMSPreferencesDialog.cpp           |   87 +-
 src/Preferences/WMSPreferencesDialog.h             |   13 +
 src/Preferences/WMSPreferencesDialog.ui            |   40 +-
 src/Preferences/WmsServersList.cpp                 |    6 +-
 src/QMapControl/WmscMapAdapter.h                   |    4 +-
 src/QMapControl/browserimagemanager.cpp            |   15 +-
 src/QMapControl/browserimagemanager.h              |    6 +-
 src/QMapControl/imagemanager.cpp                   |   13 +-
 src/QMapControl/imagemanager.h                     |    6 +-
 src/QMapControl/mapcontrol.cpp                     |    2 +-
 src/QMapControl/mapcontrol.h                       |    8 +-
 src/QMapControl/mapnetwork.cpp                     |   18 +-
 src/QMapControl/tilemapadapter.h                   |    4 +-
 src/QMapControl/wmsmapadapter.h                    |    4 +-
 src/Render/MapRenderer.cpp                         |  146 -
 src/Render/NativeRenderDialog.cpp                  |   24 +-
 src/Sync/DirtyList.cpp                             |   74 +-
 src/Sync/DirtyListExecutorOSC.cpp                  |    6 +-
 src/Sync/DownloadOSM.cpp                           |  115 +-
 src/Sync/DownloadOSM.h                             |    3 +-
 src/Sync/SyncListDialog.ui                         |  263 +-
 src/TagTemplate/TagTemplate.cpp                    |   32 +-
 src/Tools/QFatFs/QFat.cpp                          |    2 +-
 src/Utils/EditCompleterDelegate.cpp                |    2 +-
 src/Utils/OsmLink.cpp                              |   41 +
 src/Utils/SlippyMapWidget.cpp                      |  208 +-
 src/Utils/SlippyMapWidget.h                        |    6 +-
 src/Utils/TagSelector.cpp                          |   73 +-
 src/Utils/TagSelector.h                            |    6 +-
 src/common/AboutDialog.ui                          |  113 +-
 src/common/Document.cpp                            |    5 +-
 src/common/FeatureManipulations.cpp                |    3 +-
 src/common/Global.cpp                              |    4 +-
 src/common/Global.h                                |    4 +-
 src/common/MapView.cpp                             |   27 +-
 src/common/MapView.h                               |    6 +
 src/common/Projection.cpp                          |   12 +-
 src/common/TagModel.cpp                            |   15 +-
 src/merkaartor.desktop                             |    2 +-
 src/qextserialport/posix_qextserialport.cpp        |    2 +-
 src/src.pro                                        |   84 +-
 translations/README                                |   25 -
 translations/README.md                             |   25 +
 translations/merkaartor_ar.ts                      | 6117 ++++++++---------
 translations/merkaartor_cs.ts                      | 6902 +++++++++----------
 translations/merkaartor_de.ts                      | 6331 +++++++++---------
 .../{merkaartor_et.ts => merkaartor_en.ts}         | 4295 ++++++------
 translations/merkaartor_es.ts                      | 5967 +++++++++--------
 translations/merkaartor_et.ts                      | 6179 ++++++++---------
 translations/merkaartor_fr.ts                      | 6335 +++++++++---------
 translations/merkaartor_hr.ts                      | 5559 +++++++--------
 translations/merkaartor_hu.ts                      | 6221 ++++++++---------
 .../{merkaartor_pl.ts => merkaartor_id_ID.ts}      | 7068 ++++++++++----------
 translations/merkaartor_it.ts                      | 5984 +++++++++--------
 translations/merkaartor_ja.ts                      | 5738 ++++++++--------
 translations/merkaartor_nl.ts                      | 5827 ++++++++--------
 translations/merkaartor_pl.ts                      | 5867 ++++++++--------
 translations/merkaartor_pt.ts                      | 6207 ++++++++---------
 translations/merkaartor_pt_BR.ts                   | 6112 ++++++++---------
 translations/merkaartor_ru.ts                      | 6166 ++++++++---------
 translations/merkaartor_sk.ts                      | 6185 ++++++++---------
 translations/merkaartor_sv.ts                      | 5831 ++++++++--------
 translations/merkaartor_uk.ts                      | 5889 ++++++++--------
 windows/copydeps.sh                                |   14 +
 windows/installer.nsi                              |   11 +-
 windows/upload-to-bintray.pl                       |   33 +
 185 files changed, 63686 insertions(+), 61775 deletions(-)
 create mode 100644 .drone.sec
 create mode 100644 .drone.yml
 create mode 100644 .tx/config
 create mode 100644 COMPILE.md
 delete mode 100644 HACKING
 create mode 100644 HACKING.md
 delete mode 100644 INSTALL
 create mode 100644 Icons/128x128/merkaartor.png
 create mode 100644 Icons/16x16/merkaartor.png
 create mode 100644 Icons/192x192/merkaartor.png
 create mode 100644 Icons/22x22/merkaartor.png
 create mode 100644 Icons/24x24/merkaartor.png
 create mode 100644 Icons/256x256/merkaartor.png
 create mode 100644 Icons/32x32/merkaartor.png
 create mode 100644 Icons/36x36/merkaartor.png
 create mode 100644 Icons/40x40/merkaartor.png
 create mode 100644 Icons/42x42/merkaartor.png
 create mode 100644 Icons/512x512/merkaartor.png
 create mode 100644 Icons/64x64/merkaartor.png
 create mode 100644 Icons/72x72/merkaartor.png
 create mode 100644 Icons/80x80/merkaartor.png
 create mode 100644 Icons/8x8/merkaartor.png
 create mode 100644 Icons/96x96/merkaartor.png
 create mode 100644 README.md
 copy Styles/{MapnikPlus.mas => Merkaartor.mas} (75%)
 delete mode 100644 TODO
 create mode 100755 ci/travis-linux-install.sh
 create mode 100755 ci/travis-linux-script.sh
 create mode 100755 ci/travis-osx-install.sh
 create mode 100755 ci/travis-osx-script.sh
 delete mode 100644 translations/README
 create mode 100644 translations/README.md
 copy translations/{merkaartor_et.ts => merkaartor_en.ts} (83%)
 copy translations/{merkaartor_pl.ts => merkaartor_id_ID.ts} (63%)
 create mode 100755 windows/upload-to-bintray.pl

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



More information about the Pkg-grass-devel mailing list