[merkaartor] 06/08: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Jun 6 20:54:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit 383e7cd5a3c8b1ba00fe7996e1b52e486d4a5c80
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jun 6 21:27:10 2016 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
.../0001-Fixed-GDAL-imports-for-GDAL-2.0.patch | 58 --
...ompilation-issues-with-GEOIMAGE-1-and-Qt5.patch | 41 --
debian/patches/0001-Fixed-debug-build.patch | 22 -
.../0001-Fixed-version-info-in-tarballs.patch | 27 -
...ted-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch | 38 --
...AL-import-to-always-confirm-projection-be.patch | 21 -
debian/patches/desktop-keywords-syntax.patch | 17 -
debian/patches/desktop-keywords.patch | 13 -
debian/patches/hardening-buildflags.patch | 18 -
debian/patches/immediately-typo.patch | 16 -
debian/patches/libgps22.patch | 26 -
debian/patches/occurrence-typo.patch | 16 -
debian/patches/qmake-config-nostrip.patch | 4 +-
debian/patches/series | 15 -
debian/patches/suppress-typo.patch | 16 -
debian/patches/unknown-typo.patch | 214 -------
debian/patches/various-typos.patch | 647 ---------------------
18 files changed, 3 insertions(+), 1207 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7b433b0..fc3d381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ merkaartor (0.18.3~rc1-1) UNRELEASED; urgency=medium
* Update copyright file, changes:
- Update copyright years for Bart Vanhauwaert,
Chris Browet & Ladislav Láska.
+ * Drop patches applied upstream, refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Mon, 06 Jun 2016 20:12:06 +0200
diff --git a/debian/patches/0001-Fixed-GDAL-imports-for-GDAL-2.0.patch b/debian/patches/0001-Fixed-GDAL-imports-for-GDAL-2.0.patch
deleted file mode 100644
index ad24588..0000000
--- a/debian/patches/0001-Fixed-GDAL-imports-for-GDAL-2.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b333cd33e487f79ae8cd0c2eea145baf650e793d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Sun, 26 Jul 2015 00:01:07 +0200
-Subject: Fixed GDAL imports for GDAL 2.0.
-Origin: https://github.com/openstreetmap/merkaartor/commit/b333cd33e487f79ae8cd0c2eea145baf650e793d
-
-The GDALOpen is not willing to use vector formats. Replaced by GDALOpenEx.
----
- src/ImportExport/ImportExportGdal.cpp | 7 +++----
- src/MainWindow.cpp | 2 +-
- src/common/Document.cpp | 3 ---
- 3 files changed, 4 insertions(+), 8 deletions(-)
-
---- a/src/ImportExport/ImportExportGdal.cpp
-+++ b/src/ImportExport/ImportExportGdal.cpp
-@@ -487,16 +487,15 @@ bool ImportExportGdal::import(Layer* aLa
- #ifdef GDAL2
- GDALAllRegister();
- GDALDataset *poDS;
-- poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
-+ poDS = (GDALDataset *) GDALOpenEx( FileName.toUtf8().constData(), GDAL_OF_VECTOR | GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, NULL, NULL, NULL );
- #else
- OGRRegisterAll();
- OGRDataSource *poDS;
- poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
- #endif
-
-- if( poDS == NULL )
-- {
-- qDebug( "GDAL Open failed.\n" );
-+ if( poDS == NULL ) {
-+ //qDebug() << "GDAL Open failed from file " << FileName.toUtf8().constData();
- return false;
- }
-
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -1739,7 +1739,7 @@ MainWindow::ImportStatus MainWindow::imp
- newLayer = new DrawingLayer( baseFileName );
- newLayer->setUploadable(false);
- mapDocument->add(newLayer);
-- return mapDocument->importGDAL(baseFileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
-+ return mapDocument->importGDAL(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
- }
- }
-
---- a/src/common/Document.cpp
-+++ b/src/common/Document.cpp
-@@ -736,9 +736,6 @@ bool Document::importKML(const QString&
- #ifndef _MOBILE
- bool Document::importGDAL(const QString& filename, DrawingLayer* NewLayer)
- {
-- Q_UNUSED(filename)
-- Q_UNUSED(NewLayer)
--
- ImportExportGdal imp(this);
- if (!imp.loadFile(filename))
- return false;
diff --git a/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch b/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
deleted file mode 100644
index 70b1de3..0000000
--- a/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e6d015a953a163f174e09a9b50c9bb8bc19593e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Mon, 27 Jul 2015 14:22:37 +0200
-Subject: Fixed compilation issues with GEOIMAGE=1 and Qt5.
-Origin: https://github.com/openstreetmap/merkaartor/commit/e6d015a953a163f174e09a9b50c9bb8bc19593e4
-
----
- src/Docks/GeoImageDock.cpp | 4 ++--
- src/Docks/GeoImageDock.h | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis
-
- Exiv2::Image::AutoPtr image;
- Exiv2::ExifData exifData;
-- bool positionValid = FALSE;
-+ bool positionValid = false;
-
- Layer *theLayer;
- if (photoLayer == NULL) {
-@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(
- double lat = 0.0, lon = 0.0;
- Exiv2::Image::AutoPtr image;
- Exiv2::ExifData exifData;
-- bool positionValid = FALSE;
-+ bool positionValid = false;
-
- if (!QFile::exists(file)) {
- return pos;
---- a/src/Docks/GeoImageDock.h
-+++ b/src/Docks/GeoImageDock.h
-@@ -9,6 +9,7 @@
- #include <QtWidgets/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <QDrag>
-
- class ImageView;
-
diff --git a/debian/patches/0001-Fixed-debug-build.patch b/debian/patches/0001-Fixed-debug-build.patch
deleted file mode 100644
index 1a50e64..0000000
--- a/debian/patches/0001-Fixed-debug-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 72c8c2bbc02c1a9dc57943d688f8a5667a9aeec6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Sat, 1 Aug 2015 16:02:41 +0200
-Subject: Fixed debug build.
-Origin: https://github.com/openstreetmap/merkaartor/commit/72c8c2bbc02c1a9dc57943d688f8a5667a9aeec6
-
-For some reason, CONFIG += debug_and_release in src/src.pro was missing.
----
- src/src.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,6 +6,8 @@ include (Config.pri)
- #Custom config
- include(Custom.pri)
-
-+CONFIG += debug_and_release
-+
- isEmpty(SYSTEM_QTSA) {
- include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
- } else {
diff --git a/debian/patches/0001-Fixed-version-info-in-tarballs.patch b/debian/patches/0001-Fixed-version-info-in-tarballs.patch
deleted file mode 100644
index 4adce0b..0000000
--- a/debian/patches/0001-Fixed-version-info-in-tarballs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a6f3d9f2133e3656b9c63441c600a7219b54450c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Mon, 27 Jul 2015 11:01:52 +0200
-Subject: Fixed version info in tarballs.
-Origin: https://github.com/openstreetmap/merkaartor/commit/a6f3d9f2133e3656b9c63441c600a7219b54450c
-
----
- src/Config.pri | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/src/Config.pri
-+++ b/src/Config.pri
-@@ -1,7 +1,12 @@
- # see http://merkaartor.be/wiki/merkaartor/Compiling
-
--REVISION = $$system(git describe --tags)
--VERSION = $$system(git describe --tags | sed "'s/-g.*//;s/-/./g'")
-+REVISION = $$system(git describe --tags 2> /dev/null)
-+VERSION = $$system(git describe --tags 2> /dev/null | sed "'s/-g.*//;s/-/./g'")
-+isEmpty( REVISION ) {
-+ REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
-+ VERSION = $$REVISION
-+}
-+
- ARCH=""
- BITS=""
- win32 {
diff --git a/debian/patches/0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch b/debian/patches/0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
deleted file mode 100644
index 7cebb71..0000000
--- a/debian/patches/0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ba74296b66745a5cdd592e88af2252a22c6b1840 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Thu, 15 Oct 2015 15:34:56 +0200
-Subject: Implemented SYSTEM_QUAZIP_LDFLAGS, fixing issue #66.
-Origin: https://github.com/openstreetmap/merkaartor/commit/ba74296b66745a5cdd592e88af2252a22c6b1840
-Bug: https://github.com/openstreetmap/merkaartor/issues/66
-
----
- INSTALL | 2 ++
- src/src.pro | 6 +++++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/INSTALL
-+++ b/INSTALL
-@@ -97,6 +97,8 @@ NODEBUG=1 - release ta
- NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
- SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal
- SYSTEM_QUAZIP - use system copy of quazip instead of internal
-+SYSTEM_QUAZIP_LDFLAGS - custom flags instead of the default "-lquazip", if
-+ your library has different name
- SPATIALITE=1 - compile spatialite backend (not working) and
- SpatialiteBackground plugin (state unknown). Use
- at your own risk.
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -17,7 +17,11 @@ isEmpty(SYSTEM_QUAZIP) {
- DEFINES += QUAZIP_STATIC
- include(../3rdparty/quazip-0.7/quazip.pri)
- } else {
-- LIBS += -lquazip
-+ isEmpty(SYSTEM_QUAZIP_LDFLAGS) {
-+ LIBS += -lquazip
-+ } else {
-+ LIBS += $$SYSTEM_QUAZIP_LDFLAGS
-+ }
- }
-
- #Qt Version
diff --git a/debian/patches/0001-Modified-GDAL-import-to-always-confirm-projection-be.patch b/debian/patches/0001-Modified-GDAL-import-to-always-confirm-projection-be.patch
deleted file mode 100644
index e28d639..0000000
--- a/debian/patches/0001-Modified-GDAL-import-to-always-confirm-projection-be.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From a350968c1a3c11be58a378ee705e381719353106 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Mon, 27 Jul 2015 10:59:14 +0200
-Subject: Modified GDAL import to always confirm projection before import.
-Origin: https://github.com/openstreetmap/merkaartor/commit/a350968c1a3c11be58a378ee705e381719353106
-
----
- src/Preferences/MerkaartorPreferences.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/Preferences/MerkaartorPreferences.cpp
-+++ b/src/Preferences/MerkaartorPreferences.cpp
-@@ -1253,7 +1253,7 @@ M_PARAM_IMPLEMENT_BOOL(AutoSourceTag, ba
- /* Data */
- M_PARAM_IMPLEMENT_STRING(OpenStreetBugsUrl, data, "http://openstreetbugs.schokokeks.org/api/0.1/")
- M_PARAM_IMPLEMENT_STRING(MapdustUrl, data, "http://www.mapdust.com/feed?lang=en&ft=wrong_turn,bad_routing,oneway_road,blocked_street,missing_street,wrong_roundabout,missing_speedlimit,other&fd=1&minR=&maxR=")
--M_PARAM_IMPLEMENT_BOOL(GdalConfirmProjection, data, false)
-+M_PARAM_IMPLEMENT_BOOL(GdalConfirmProjection, data, true)
- M_PARAM_IMPLEMENT_BOOL(HasAutoLoadDocument, data, false)
- M_PARAM_IMPLEMENT_STRING(AutoLoadDocumentFilename, data, "")
-
diff --git a/debian/patches/desktop-keywords-syntax.patch b/debian/patches/desktop-keywords-syntax.patch
deleted file mode 100644
index 1d3eebf..0000000
--- a/debian/patches/desktop-keywords-syntax.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix desktop file syntax for Keywords list
- desktop-file-validate reported this error:
- .
- src/merkaartor.desktop: hint: value "Education;Geography;Network;Qt;" for key "Categories" in group "Desktop Entry" contains more than one main category; application might appear more than once in the application menu
- src/merkaartor.desktop: error: value "OSM;GIS;Map;Geo" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/78
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/ff455d627b0f79e42742b9a3d48a90e73dda230e
-
---- a/src/merkaartor.desktop
-+++ b/src/merkaartor.desktop
-@@ -10,4 +10,4 @@ Exec=merkaartor
- Terminal=false
- StartupNotify=false
- Categories=Education;Geography;Network;Qt;
--Keywords=OSM;GIS;Map;Geo
-+Keywords=OSM;GIS;Map;Geo;
diff --git a/debian/patches/desktop-keywords.patch b/debian/patches/desktop-keywords.patch
deleted file mode 100644
index 225f736..0000000
--- a/debian/patches/desktop-keywords.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add Keywords to .desktop file.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/68
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/d441932e6704481e48fdc0b6f27adee6b85e38af
-
---- a/src/merkaartor.desktop
-+++ b/src/merkaartor.desktop
-@@ -10,4 +10,4 @@ Exec=merkaartor
- Terminal=false
- StartupNotify=false
- Categories=Education;Geography;Network;Qt;
--
-+Keywords=OSM;GIS;Map;Geo
diff --git a/debian/patches/hardening-buildflags.patch b/debian/patches/hardening-buildflags.patch
deleted file mode 100644
index b3be72f..0000000
--- a/debian/patches/hardening-buildflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Add hardening buildflags to qmake build.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/68
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/d441932e6704481e48fdc0b6f27adee6b85e38af
-
---- a/src/Config.pri
-+++ b/src/Config.pri
-@@ -36,3 +36,10 @@ win32 {
- }
-
- QMAKE_CXXFLAGS_WARN_ON += -Wno-reorder
-+
-+# Append buildflags set in the environment
-+QMAKE_CPPFLAGS += $$(CPPFLAGS)
-+QMAKE_CFLAGS += $$(CFLAGS) $$(CPPFLAGS)
-+QMAKE_CXXFLAGS += $$(CXXFLAGS) $$(CPPFLAGS)
-+QMAKE_LFLAGS += $$(LDFLAGS)
-+
diff --git a/debian/patches/immediately-typo.patch b/debian/patches/immediately-typo.patch
deleted file mode 100644
index d8c4b49..0000000
--- a/debian/patches/immediately-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'immediatly' typo, replace with 'immediately'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/90
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/f1aec22e4844b1eb1342cc7d1499fbc88ff266b2
-
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -855,7 +855,7 @@ v0.06 5 dec 2006
- * ADD : type combobox to set highway tag
- * FIX : no busy waiting for OSM download
- * ADD : progress dialog while downloading from OSM
-- * FIX : refresh view immediatly after download
-+ * FIX : refresh view immediately after download
- * FIX : download segments outside original bounding box for roads
- * FIX : don't call QStatusbar methods from a paintEvent
- * FIX : speed up drawing of roads when zoomed out
diff --git a/debian/patches/libgps22.patch b/debian/patches/libgps22.patch
deleted file mode 100644
index cd2e3a0..0000000
--- a/debian/patches/libgps22.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix gpsdata handling for gpsd >= 3.12 (libgps22 | GPSD_API_MAJOR_VERSION 6)
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/openstreetmap/merkaartor/issues/76
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/77
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/02f72ddcfd5007149d0810d0c1149699713a8f11
-
---- a/src/GPS/qgpsdevice.cpp
-+++ b/src/GPS/qgpsdevice.cpp
-@@ -1056,10 +1056,17 @@ void QGPSDDevice::onDataAvailable()
- satArray[i][0] = satArray[i][1] = satArray[i][2] = 0;
- for (int i=0; i<num_sat; ++i)
- {
-+#if GPSD_API_MAJOR_VERSION > 5
-+ int id = gpsdata->skyview[i].PRN;
-+ satArray[id][0] = gpsdata->skyview[i].elevation;
-+ satArray[id][1] = gpsdata->skyview[i].azimuth;
-+ satArray[id][2] = gpsdata->skyview[i].ss;
-+#else
- int id = gpsdata->PRN[i];
- satArray[id][0] = gpsdata->elevation[i];
- satArray[id][1] = gpsdata->azimuth[i];
- satArray[id][2] = gpsdata->ss[i];
-+#endif
- }
- setNumSatellites(num_sat);
-
diff --git a/debian/patches/occurrence-typo.patch b/debian/patches/occurrence-typo.patch
deleted file mode 100644
index c15bb8c..0000000
--- a/debian/patches/occurrence-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'occurence' typo, replace with 'occurrence'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/84
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/fe9c77e1607057f01753961390f1cce0e994a062
-
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -721,7 +721,7 @@ v0.11
- * ADD : french translation
- * ADD : Merkaartor document (*.mdc)
- * FIX : Apply button in Preferences now updates the main window immediately
-- * FIX : if a feature contains a node more than once, if the node is deleted, only the first occurence is removed
-+ * FIX : if a feature contains a node more than once, if the node is deleted, only the first occurrence is removed
- * ADD : merge nodes function
- * FIX : don't ignore "width" tags on export
- * ADD : translation capabilities
diff --git a/debian/patches/qmake-config-nostrip.patch b/debian/patches/qmake-config-nostrip.patch
index 229767f..e8c3176 100644
--- a/debian/patches/qmake-config-nostrip.patch
+++ b/debian/patches/qmake-config-nostrip.patch
@@ -50,5 +50,5 @@ Forwarded: not-needed
-CONFIG += debug_and_release
+CONFIG += debug_and_release nostrip
- isEmpty(SYSTEM_QTSA) {
- include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
+ # This is a workaround to get qDebug() to stdout on Windows
+ win32 {
diff --git a/debian/patches/series b/debian/patches/series
index e1ccda3..2016e86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1 @@
-0001-Fixed-GDAL-imports-for-GDAL-2.0.patch
-0001-Fixed-version-info-in-tarballs.patch
-0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
-0001-Modified-GDAL-import-to-always-confirm-projection-be.patch
-0001-Fixed-debug-build.patch
-0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
-various-typos.patch
-hardening-buildflags.patch
-desktop-keywords.patch
qmake-config-nostrip.patch
-libgps22.patch
-desktop-keywords-syntax.patch
-unknown-typo.patch
-occurrence-typo.patch
-suppress-typo.patch
-immediately-typo.patch
diff --git a/debian/patches/suppress-typo.patch b/debian/patches/suppress-typo.patch
deleted file mode 100644
index 19f892d..0000000
--- a/debian/patches/suppress-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'surpress' typo, replace with 'suppress'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/90
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/f1aec22e4844b1eb1342cc7d1499fbc88ff266b2
-
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -839,7 +839,7 @@ v0.07 18 aug 2007
- * ADD : nice painting for water
- * ADD : file->new menu option to start a new map
- * FIX : change current directory when opening a file
-- * FIX : surpress drawing artefact when creating a new segment
-+ * FIX : suppress drawing artefact when creating a new segment
- * FIX : avoid Qt to have to process download notifications recursively
- * ADD : scripts to create the windows installation package
- * ADD : create way from selected segments tool
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
deleted file mode 100644
index 325c1db..0000000
--- a/debian/patches/unknown-typo.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Description: Fix 'Unknow' typo, replace with 'Unknown'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/84
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/fe9c77e1607057f01753961390f1cce0e994a062
-
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -1970,7 +1970,7 @@ void MainWindow::loadUrl(const QUrl& the
- }
- }
- } else {
-- QMessageBox::critical(this, tr("Incoming Remote control request"), tr("Unknow action url: %1").arg(theUrl.toString()));
-+ QMessageBox::critical(this, tr("Incoming Remote control request"), tr("Unknown action url: %1").arg(theUrl.toString()));
- }
- #undef theQuery
- }
---- a/translations/merkaartor_ar.ts
-+++ b/translations/merkaartor_ar.ts
-@@ -2360,7 +2360,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_cs.ts
-+++ b/translations/merkaartor_cs.ts
-@@ -3341,7 +3341,7 @@ Pokud si nejste jisti , prosím požáde
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_de.ts
-+++ b/translations/merkaartor_de.ts
-@@ -2020,7 +2020,7 @@ Wollen Sie Ihre Änderungen speichern?</
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation>Unbekannte Aktions-URL: %1</translation>
- </message>
- <message>
---- a/translations/merkaartor_es.ts
-+++ b/translations/merkaartor_es.ts
-@@ -2277,7 +2277,7 @@ Si no estás seguro, deberías preguntar
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_et.ts
-+++ b/translations/merkaartor_et.ts
-@@ -2408,7 +2408,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_fr.ts
-+++ b/translations/merkaartor_fr.ts
-@@ -2013,7 +2013,7 @@ Do you want to save your changes?</sourc
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_hr.ts
-+++ b/translations/merkaartor_hr.ts
-@@ -2535,7 +2535,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_hu.ts
-+++ b/translations/merkaartor_hu.ts
-@@ -3810,7 +3810,7 @@ Do you want to save your changes?</sourc
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_it.ts
-+++ b/translations/merkaartor_it.ts
-@@ -2483,7 +2483,7 @@ Do you want to save your changes?</sourc
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_ja.ts
-+++ b/translations/merkaartor_ja.ts
-@@ -2338,7 +2338,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_nl.ts
-+++ b/translations/merkaartor_nl.ts
-@@ -2394,7 +2394,7 @@ Weet je absoluut zeker dat deze KML lega
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_pl.ts
-+++ b/translations/merkaartor_pl.ts
-@@ -2263,7 +2263,7 @@ Czy zachować zmiany?</translation>
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation>Nieznany url działania: %1</translation>
- </message>
- <message>
---- a/translations/merkaartor_pt.ts
-+++ b/translations/merkaartor_pt.ts
-@@ -2366,7 +2366,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_pt_BR.ts
-+++ b/translations/merkaartor_pt_BR.ts
-@@ -2323,7 +2323,7 @@ Si no estás seguro, deberías preguntar
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_ru.ts
-+++ b/translations/merkaartor_ru.ts
-@@ -2010,7 +2010,7 @@ Do you want to save your changes?</sourc
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_sk.ts
-+++ b/translations/merkaartor_sk.ts
-@@ -2365,7 +2365,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_sv.ts
-+++ b/translations/merkaartor_sv.ts
-@@ -2387,7 +2387,7 @@ Om du är osäker, vänligen fråga på
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_uk.ts
-+++ b/translations/merkaartor_uk.ts
-@@ -2393,7 +2393,7 @@ Are you absolutely sure this KML can leg
- </message>
- <message>
- <location filename="../src/MainWindow.cpp" line="1935"/>
-- <source>Unknow action url: %1</source>
-+ <source>Unknown action url: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
diff --git a/debian/patches/various-typos.patch b/debian/patches/various-typos.patch
deleted file mode 100644
index 0370422..0000000
--- a/debian/patches/various-typos.patch
+++ /dev/null
@@ -1,647 +0,0 @@
-Description: Fix various typos.
- * Replace 'succesfully' with 'successfully'.
- * Replace 'Explicitely' with 'Explicitly'.
- * Replace 'GNU Public License' with 'GNU General Public License'.
- * Replace 'allows to <verb>' with 'allows to <verb>ing' or 'allows one to <verb>'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/68
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/d441932e6704481e48fdc0b6f27adee6b85e38af
-
---- a/src/qextserialport/posix_qextserialport.cpp
-+++ b/src/qextserialport/posix_qextserialport.cpp
-@@ -823,7 +823,7 @@ bool Posix_QextSerialPort::open(OpenMode
- Posix_File->setFileName(port);
- qDebug("Trying to open File");
- if (Posix_File->open(QIODevice::ReadWrite|QIODevice::Unbuffered)) {
-- qDebug("Opened File succesfully");
-+ qDebug("Opened File successfully");
- /*set open mode*/
- QIODevice::open(mode);
-
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -74,7 +74,7 @@ v0.18
- * ADD : Self-contained style packages (*.msz)
- * FIX : mutex deadlock (refs #3319)
- * FIX : Protect updatemeta (fixes #3317)
-- * ADD : Allow to show/hide the toolbars labels (toolbar context menu)
-+ * ADD : Allow showing/hiding the toolbars labels (toolbar context menu)
- * ADD : "Select parent(s)" & "Download missing children" to the Feature menu (refs #3314)
- * FIX : force redrawing the osm map when zooming (fixes #3316)
- * FIX : Mutex-lock update of the painters (fixes #3315)
-@@ -122,9 +122,9 @@ v0.18
- * FIX : do not create ~/.merkaartor in portable mode
- * FIX : Handle UTF8 in GDAL fields
- * CHG : When doing GDAL imports, always confirm input projection
-- * ADD : Allow to use projection chooser in projection editor
-- * ADD : Allow to enter WKT in projection chooser
-- * ADD : Goto dialog: Allow to show/edit coordinates in projected units
-+ * ADD : Allow using projection chooser in projection editor
-+ * ADD : Allow entering WKT in projection chooser
-+ * ADD : Goto dialog: Allow showing/editing coordinates in projected units
- * FIX : Only check styles for POI nodes
- * FIX : Feature dock: Relations not shown in "All' tab
- * FIX : log2 not available on FreeBSD (fixes #3211)
-@@ -136,17 +136,17 @@ v0.18
- v0.17
- * FIX : Problem importing OSM comprising new features
- * ADD : Move "validation" style rules to a new "Validation.mas" style
-- * ADD : Allow to align background image with <SPACE>+pan
-+ * ADD : Allow aligning background image with <SPACE>+pan
- * CHG : Rename "Create rectangle" to "Create rectangular building" and automatically add "building=yes"
- * ADD : Remember "Create polygon" last number of sides
-- * ADD : "Relation->Add to Multipolygon"; allows to create or add to a multipolygon relation (closes 2889)
-+ * ADD : "Relation->Add to Multipolygon"; allows creating or adding to a multipolygon relation (closes 2889)
- * ADD : Network timeout preference
- * CHG : Paste Tags : Allow any<->any pasting but only takes top level features into account (fixes #3174)
- * FIX : When loading history from MDC, do not import the command if the layer is not found + save layers dirty level in MDC (fixes #3176)
- * FIX : Locked zoom was bugged since passage to real pixel per Meter (fixes #3175)
- * FIX : Allow creating a way in non-separate move mode with a virtual node selected (fixes #3172)
- * FIX : Revert to custom icon for move interaction on MAC (fixes #3170)
-- * FIX : GeoTIFF + GDAL backgrounds: Allow to specify an automatic "source" tag via the plugin menu
-+ * FIX : GeoTIFF + GDAL backgrounds: Allow specifying an automatic "source" tag via the plugin menu
- * ADD : Bing Maps plugin
- * FIX : GDAL + GeoTIFF : if a ESRI World File (.tfw, *.wld) is present, override file geotransform
- * FIX : GDAL + GeoTIFF : if the projection cannot be determined, ask for it rather than fail
-@@ -154,15 +154,15 @@ v0.17
- * FIX : Cannot access TMS servers that Min-zoom equals Max-zoom (fixes #3157)
- * ADD : GDAL raster background plugin
- * FIX : WMS Editor - Handle Styles properly
-- * ADD : Explicitely add GML to the list of supported format (via GDAL)
-+ * ADD : Explicitly add GML to the list of supported format (via GDAL)
- * ADD : Bicycle style by Markus Straub
-- * ADD : Styles : allow to texture areas with an icon
-- * CHG : When opening/importing, always fallback to GDAL if available. Allows to open most GDAL supported geomtery files.
-+ * ADD : Styles : allow texturing areas with an icon
-+ * CHG : When opening/importing, always fallback to GDAL if available. Allows opening most GDAL supported geomtery files.
- * ADD : Vector map layers
- * ADD : Allow "[*] is xxx" (or "*=xxx") construct in tag selection. Means a feature match if any of its tags has xxx as a value (fixes #3146)
-- * ADD : Do not allow to delete OSM nodes in non-downloaded areas (refs #3083)
-+ * ADD : Do not allow deleting OSM nodes in non-downloaded areas (refs #3083)
- * ADD : Save the downloaded areas in the MDC. Expired after 12h.
-- * ADD : Allow to specify the Nominatim url in preferences
-+ * ADD : Allow specifying the Nominatim url in preferences
- * ADD : French Cadastre plugin
- * FIX : Infloop on next/previous image when none visible (fixes #3135)
- * CHG : Do not wait for "CLOSE changeset" response
-@@ -171,7 +171,7 @@ v0.17
- * ADD : Auto-add "source" tag when drawing over a background map; define the value in the WMS and TMS editors
- * FIX : Filter out invalid value for first Tag list column width (fixes #3129)
- * FIX : Remove tags from autocomplete suggestions when cleared from features (fixes #3113)
-- * ADD : Allow to start merkaartor with a document template specified in preferences
-+ * ADD : Allow starting merkaartor with a document template specified in preferences
- * CHG : Layers & View settings are now saved in a $HOME/Startup.mdc document rather than thru QSettings
- * ADD : New CL options: "--ignore-preferences" && "--reset-preferences"
- * FIX : Re-enable PgUp/PgDown in Geoimage dock (dock must be focused) (fixes #3126); coincidentaly, PgUp/PgDown for zooming only works when the map view is focused.
-@@ -183,7 +183,7 @@ v0.17
- * FIX : remove dependency on GDAL data files when importing OSGB36 shapefiles + correct projection (closes #3119)
- * ADD : New preference: "Allow node/way creation in select mode". When checked, allows double-click to create a node and double-click on a node to start a way in select mode.
- * ADD : When drawing ways, double-clicking finishes the current way (Potlach/JOSM style)
-- * ADD : Way segments: Keeping ALT depressed allows to move way segment
-+ * ADD : Way segments: Keeping ALT depressed allows moving a way segment
- * ADD : In Road creation mode, double-click creates a new node
- * ADD : Hardcoded PgUp/PgDown for Zoom in/Zoom out (Potlach style)
- * ADD : Snap to angle functionality when creating way: keeping "o" pressed snap to 45° angles, "h" snap to 30° angles
-@@ -193,13 +193,13 @@ v0.17
- * ADD : Cut functionality
- * ADD : double-clicking a feature selects the feature and its children
- * CHG : style update
-- * ADD : Style Editor: allow to filter the style list
-+ * ADD : Style Editor: allow filtering the style list
- * FIX : Styles: draw icons for ways, too
-- * FIX : allow to shrink properties dock
-+ * FIX : allow shrinking properties dock
- * ADD : Support for XAPI
- * ADD : ":dirty" and ":uploaded" pseudo tags for finding/filtering
- * CHG : Remove builtin "Dirty" and "Uploaded" layers. Those are now managed at feature level.
-- * ADD : Allow to rename a layer by double-clicking on its name
-+ * ADD : Allow renaming a layer by double-clicking on its name
- * FIX : Initial viewport issue
- * ADD : View menu item allowing to highlight "dirty" features, i.e., features ready for upload
- * FIX : Do not export incomplete features
-@@ -226,14 +226,14 @@ v0.17
- * FIX : problem with "Bottom-left standard" TMS
- * ADD : Printing
- * ADD : Hungarian translation by Peter Sulyok
-- * CHG : Allow to pan with middle mouse button
-+ * CHG : Allow panning with middle mouse button
- * ADD : Toolbar editor (create/modify tollbars)
- * FIX : OSX fix
- * FIX : Draw relations children dashed to avoid multiple parent drawing
- * FIX : Fix several issues with features dock.
- * FIX : Fix reappearance of deleted features.
- * FIX : Fix WayRemoveNodeCommand reversibility.
-- * ADD : Allow to move complete relations
-+ * ADD : Allow moving complete relations
- * FIX : WMS'es in EPSG:4326 not showing
- * FIX : Don't overzoom on layer zoom (and don't allow if the bbox is null). fixes #3046
- * ADD : Add a "portable" mode to merkaartor via command-line ("-p") or build setting ("PORTABLE=1")
-@@ -257,12 +257,12 @@ v0.16
- * FIX : Make JOSM happy about our .osm export (fixes #2952)
- * ADD : Preliminary support for OpenStreetBugs (Refs #983)
- * ADD : POC of a Gosmore map adapter
-- * FIX : Allow to "Force Upload" relations, too (fixes #2926)
-+ * FIX : Allow one to "Force Upload" relations, too (fixes #2926)
- * FIX : Update Feature dock when document content changes (fixes #2923)
- * CHG : Change way the virtual nodes are handled
- * CHG : Allow tag pasting between different classes of features
- * CHG : Use a different spatial index provider
-- * ADD : Allow to delete features from the context menu of the Features dock
-+ * ADD : Allow deleting features from the context menu of the Features dock
- * ADD : Accept mlon/mlat URLs as emitted by mkgmap logging
- * ADD : Walking Papers backgound plugin + load WP scans as geotagged images
- * ADD : Import from OSC (osmChange format)
-@@ -272,10 +272,10 @@ v0.16
- * ADD : CSV POI import
- * FIX : crash when closing layer with virtual nodes (fixes #2858)
- * ADD : OSGB36 to the default list of projections
-- * CHG : Allow to add images to a GeoTIFF layer
-+ * CHG : Allow adding images to a GeoTIFF layer
- * ADD : Add SHP feature attributes as not uploadable OSM Feature tags
-- * FIX : Allow to load OS VectorMap District shapefiles
-- * ADD : Allow to save geotagged images
-+ * FIX : Allow loading OS VectorMap District shapefiles
-+ * ADD : Allow saving geotagged images
- * CHG : Enhanced support for geotagged images drag&drop
- * CHG : Geotag support enhancements
- * FIX : use gpsd api and implement gpsd-ng
-@@ -284,12 +284,12 @@ v0.16
- * FIX : crash when closing layers containing photos (fixes #2828)
- * CHG : Allow importing geotagged photos when no track layer is present (closes #2827)
- * ADD : Templates xsd (by Jonathan Bennett) (closes #2809; closes #2707)
-- * ADD : allow to re-order relation members (closes #2759)
-+ * ADD : allow re-ordering relation members (closes #2759)
- * FIX : solves a problem when hovering large relations
- * ADD : add a projection editor
- * ADD : allow google maps links in goto and download dialogs
- * FIX : abort tile downloading when zooming
-- * ADD : Allow to tile (and cache) arbitrary WMS'es (only EPSG:4326 and google projection supported)
-+ * ADD : Allow tiling (and caching) arbitrary WMS'es (only EPSG:4326 and google projection supported)
- * CHG : rework "Zoom lock" and move it to the view menu
- * ADD : support for WMS-C servers (see http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers) (closes #2598)
- * FIX : problem when joining ways
-@@ -304,7 +304,7 @@ v0.16
- * FIX : OSX Qt system translations location (by Aleksandar)
- * FIX : Update language of language combo after language change (by Alaeksandar)
- * FIX : Only allow virtual node updates after relations resolution (by Trav)(closes #2782)
-- * ADD : Allow to zoom on the location of a GeoTIFF image
-+ * ADD : Allow zooming on the location of a GeoTIFF image
- * FIX : Do not updateindex() if the feature is deleted
- * FIX : roads not always refreshed when changing type or properties (fixes #2773)
- * FIX : Cannot cleanly copy tags from one relation to another (fixes #2746)
-@@ -335,7 +335,7 @@ v0.15
- * ADD : GeoTIFF background plugin (closes #1025)
- * ADD : Grabbing hand icon in signle mouse mode
- * FIX : Layers menu entry for background layer is wrong at startup. Patch by Trav (closes #2641)
-- * ADD : When in "single mouse button" mode, allow to cancel most operation with a right-click
-+ * ADD : When in "single mouse button" mode, allow canceling most operation with a right-click
- * ADD : "Zoom lock" mode. Zoom steps are locked to TMS ones and projection is locked to Mercator
- * FIX : get sharper Yahoo images (closes #2623)
- * FIX : tag value "Fast food" should be "fast_food" (closes #2625)
-@@ -345,7 +345,7 @@ v0.15
- * FIX : URL's in about dialog (fixes #2606)
- * FIX : Export trackpoints time when exporting GPX (fixes #2594)
- * ADD : Virtual nodes allow fast creation of intermediary nodes (closes #821)
-- * ADD : Allow to move node in Node creation mode (closes #1910)
-+ * ADD : Allow moving node in Node creation mode (closes #1910)
- * CHG : Only generate log files on request (--log) on release builds
- * FIX : speedup epsg:4326 projection
- * FIX : WMS projection related bugfixes
-@@ -362,7 +362,7 @@ v0.15
- * ADD : Mac OS X icon (closes #2254)
- * FIX : Force custom Qt style if Qt runtime version < 4.5.1 (fixes #2204)
- * ADD : Allow all platforms to connect to a gpsd backend
-- * FIX : Set gpsd output to NMEA; allow to save log
-+ * FIX : Set gpsd output to NMEA; allow saving log
- * FIX : Do not draw background if saved pixmap is null as a copy of a null pixmap seems to crash on Mac (fixes #2262)
- * FIX : Fixes MacOSX plugin dir (fixes #2253)
- * FIX : Handle latlong projection in SHP files (fixes #2183)
-@@ -384,12 +384,12 @@ v0.14
- * ADD : Add a Features dock displaying the features in the current viewport
- * ADD : Add a case-sensitiveness option to the search + search by ID (closes #1509)
- * CHG : Remove support for osmarender (fixes #1966)
-- * ADD : Allow multi-selection of layers; allow to show/hide or readonly several layers at once (closes #1798)
-+ * ADD : Allow multi-selection of layers; allow one to show/hide or readonly several layers at once (closes #1798)
- * ADD : Also export routes in GPX
- * ADD : Paste features as a whole (closes #1807)
- * ADD : Spatial indexing of features for faster display with large downloaded areas.
- * ADD : Built-in list of epsg projections (from proj4)
-- * CHG : Replaced "Commit..." command by "Force Upload". Allows to force update of existing features or to upload imported features (such as SHP, KML, ...)
-+ * CHG : Replaced "Commit..." command by "Force Upload". Allows forcing update of existing features or to upload imported features (such as SHP, KML, ...)
- * FIX : User preferences thru OSM preferences system works again
- * FIX : Support projections when importing SHP files
- * ADD : Drag & drop re-ordering of the layers
-@@ -413,7 +413,7 @@ v0.14
- * ADD : log file for debugging output
- * ADD : standard command-line arguments (-h, -v, ...) (fixes #1712)
- * FIX : Use application-wide proxy (fixes #1763)
-- * ADD : Allow to specify a user/password for the proxy (untested by me)
-+ * ADD : Allow specifying a user/password for the proxy (untested by me)
- * FIX : Photo localization patch from Toby Speight.
- * FIX : Set version of newly uploaded objects at 1.
- * FIX : Graphical corruption on Intel chipsets when "Show downloaded areas" was enabled
-@@ -423,7 +423,7 @@ v0.14
- * FIX : API 0.6: Error when deleting a road with no nodes (fixes #1732)
- * FIX : Correctly handle plural forms in MapLayer information
- * FIX : API 0.6: Do not add "created_by" to changed features (fixes #1728)
-- * FIX : API 0.6: Allow to define a comment on a changeset (fixes #1731)
-+ * FIX : API 0.6: Allow defining a comment on a changeset (fixes #1731)
- * FIX : API 0.6 fixes
- * FIX : Nodes fetched by relations are incomplete and not completed by "download more" (fixes #1715)
- * ADD : Initial support for Symbian S60v5
-@@ -435,9 +435,9 @@ v0.14
- * FIX : OSM/GPX import optimisations (by Trav)
- * FIX : <Esc> in Name property inspector causes AV (fixes #1672)
- * CHG : Move vector background from SHP to OSB
-- * CHG : Preferences are uploaded to OSM in binary, base-64 encoded, 254 char slice. Allow to bypass the 255 char per preference limitation.
-+ * CHG : Preferences are uploaded to OSM in binary, base-64 encoded, 254 char slice. Allow bypassing the 255 char per preference limitation.
- * CHG : Preferences lists (Bookmarks, WMS servers, ...) are now distributed and saved as XML in ~/.merkaartor. Allow proper merging (fixes #1401)
-- * ADD : Allow to choose which Qt style to use via a combobox
-+ * ADD : Allow choosing which Qt style to use via a combobox
- * CHG : Implement the custom styles as plugins
- * FIX : English language warning
- * ADD : Switch to template-based projection handling; remove dependency on libproj
-@@ -461,7 +461,7 @@ v0.13
- * FIX : Crash on layer close
- * FIX : Hardening upload process
- * FIX : Remove the deleted road from parent when joining
-- * FIX : allow to split/join roads belonging to not-completely-downloaded relations
-+ * FIX : allow spliting/joining roads belonging to not-completely-downloaded relations
- * FIX : Avert crashes by using guarded pointers
- * FIX : In case of a failed "Download more", do not delete layer if it was a previously existing one.
- * FIX : GeoTagged images are drawn to the full size of GeoImageDock
-@@ -477,7 +477,7 @@ v0.13
- * FIX : Handle Undoes while creating single/double roads (fixes #1621)
- * FIX : Re-apply custom shortcuts after retranslateUI (fixes #1620)
- * FIX : Insufficent precision for WMS bbox requests at high zoom (fixes #1618)
-- * ADD : Allow to force the custom Qt style thru Config.pri
-+ * ADD : Allow forcing the custom Qt style thru Config.pri
- * FIX : Do not remove incomplete downloaded relation; make them readonly and display them in red (temporary)
- * FIX : Painting slowdowns (+ memory consumption) when relations are involved (fixes #1528)
- * FIX : Split roads not added to Relation (fixes #1586)
-@@ -501,10 +501,10 @@ v0.13
- * FIX : Add missing tr() calls in render dialogs.
- * FIX : Messagebox-Cancel after deleting a line did not work (fixes #1392)
- * ADD : Native SVG renderer
-- * ADD : Allow to break roads (and areas) with a single node (fixes #1505)
-+ * ADD : Allow breaking roads (and areas) with a single node (fixes #1505)
- * ADD : Relation member context menu for center and zoom on the properties
- dock
-- * ADD : Allow to remove a member from a relation thru the properties dock.
-+ * ADD : Allow removing a member from a relation thru the properties dock.
- * FIX : switch to skulpture 2.2 custom style by default
- * FIX : Don't allow templates combo to grow depending on content (fixes #1482)
- * FIX : Allow disabling "Don't connect GPX nodes separated more than.." by setting it to 0. (fixes #1488)
-@@ -603,7 +603,7 @@ v0.12
- * FIX : Upload of a modified single GPX track node was not working anymore (fixes #1141)
- * ADD : Support for GeoTagged images. qmake GEOIMAGE=1 to activate. requires exiv2 (by Timo Schlüßler)
- * ADD : Move to the next field on enter in properties dock tags (by Travers Carter) (Refs #1137)
-- * ADD : revised OSB format. Allows to use large map files directly from disk with low memory footprint.
-+ * ADD : revised OSB format. Allows using large map files directly from disk with low memory footprint.
- * FIX : Native render doesn't render anything at high lat/long values(by Travers Carter) (Closes #1135)
- * FIX : Expand tables in the properties dock to the available width by default (by Travers Carter) (Closes #1136)
- * FIX : make download dialog a less cluttered
---- a/src/Main.cpp
-+++ b/src/Main.cpp
-@@ -85,7 +85,7 @@ void showVersion()
- o = QString("using Qt version %1 (built with %2)\n").arg(qVersion()).arg(QT_VERSION_STR);
- fprintf(stdout, "%s", o.toLatin1().data());
- fprintf(stdout, "Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2010\n");
-- fprintf(stdout, "This program is licensed under the Version 2 of the GNU Public License or any later version\n");
-+ fprintf(stdout, "This program is licensed under the Version 2 of the GNU General Public License or any later version\n");
- }
-
- void showHelp()
---- a/src/common/AboutDialog.ui
-+++ b/src/common/AboutDialog.ui
-@@ -116,7 +116,7 @@ p, li { white-space: pre-wrap; }
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
-- <string>This program is licensed under the GNU Public License v2</string>
-+ <string>This program is licensed under the GNU General Public License v2</string>
- </property>
- </widget>
- </item>
---- a/translations/merkaartor_ar.ts
-+++ b/translations/merkaartor_ar.ts
-@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_cs.ts
-+++ b/translations/merkaartor_cs.ts
-@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Tento program je šířen pod licencí GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Tento program je šířen pod licencí GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="114"/>
---- a/translations/merkaartor_de.ts
-+++ b/translations/merkaartor_de.ts
-@@ -10,8 +10,8 @@
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Dieses Programm ist unter der GNU Public License v2 lizenziert</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Dieses Programm ist unter der GNU General Public License v2 lizenziert</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/translations/merkaartor_es.ts
-+++ b/translations/merkaartor_es.ts
-@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>Este programa esta licenciado bajo la Licencia Publica GNU v2</translation>
- </message>
- <message>
---- a/translations/merkaartor_et.ts
-+++ b/translations/merkaartor_et.ts
-@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_fr.ts
-+++ b/translations/merkaartor_fr.ts
-@@ -10,7 +10,7 @@
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>Ce programme est publié sous Licence Publique GNU v2</translation>
- </message>
- <message>
---- a/translations/merkaartor_hr.ts
-+++ b/translations/merkaartor_hr.ts
-@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>Ovaj pogram licenciran je pod GNU javnom licencom v2</translation>
- </message>
- <message>
---- a/translations/merkaartor_hu.ts
-+++ b/translations/merkaartor_hu.ts
-@@ -10,7 +10,7 @@
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>E program a GNU GPLv2 engedéllyel jár</translation>
- </message>
- <message>
---- a/translations/merkaartor_it.ts
-+++ b/translations/merkaartor_it.ts
-@@ -10,8 +10,8 @@
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Questo programma è rilasciato sotto licenza GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Questo programma è rilasciato sotto licenza GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/translations/merkaartor_ja.ts
-+++ b/translations/merkaartor_ja.ts
-@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>このプログラムは、GNU一般公衆使用許諾バージョン2のもとでライセンスされています。</translation>
- </message>
- <message>
---- a/translations/merkaartor_nl.ts
-+++ b/translations/merkaartor_nl.ts
-@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>Dit programma valt onder de GNU Public Licentie v2</translation>
- </message>
- <message>
---- a/translations/merkaartor_pl.ts
-+++ b/translations/merkaartor_pl.ts
-@@ -76,8 +76,8 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Ten program jest objęty licencją GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Ten program jest objęty licencją GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/translations/merkaartor_pt.ts
-+++ b/translations/merkaartor_pt.ts
-@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- a/translations/merkaartor_pt_BR.ts
-+++ b/translations/merkaartor_pt_BR.ts
-@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-+ <source>This program is licensed under the GNU General Public License v2</source>
- <translation>Este programa está licenciado sob os termos da Licença Pública Geral GNU v2</translation>
- </message>
- <message>
---- a/translations/merkaartor_ru.ts
-+++ b/translations/merkaartor_ru.ts
-@@ -10,8 +10,8 @@
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Эта программа распространяется под лицензией GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Эта программа распространяется под лицензией GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/translations/merkaartor_sk.ts
-+++ b/translations/merkaartor_sk.ts
-@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Tento program je šírený pod licenciou GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Tento program je šírený pod licenciou GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/translations/merkaartor_sv.ts
-+++ b/translations/merkaartor_sv.ts
-@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Detta program är licenserat med GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Detta program är licenserat med GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/translations/merkaartor_uk.ts
-+++ b/translations/merkaartor_uk.ts
-@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="130"/>
-- <source>This program is licensed under the GNU Public License v2</source>
-- <translation>Ця програма ліцензована на умовах GNU Public License v2</translation>
-+ <source>This program is licensed under the GNU General Public License v2</source>
-+ <translation>Ця програма ліцензована на умовах GNU General Public License v2</translation>
- </message>
- <message>
- <location filename="../src/common/AboutDialog.ui" line="137"/>
---- a/3rdparty/quazip-0.7/NEWS.txt
-+++ b/3rdparty/quazip-0.7/NEWS.txt
-@@ -12,7 +12,7 @@ QuaZIP changes
- need more precise dates and times than default ones.
- * QuaZipNewInfo may now be initialized from QuaZipFileInfo64.
- * No more crashes when using QSaveFile as QIODevice for ZIP.
-- * The new QuaZip::setAutoClose() method allows to leave the
-+ * The new QuaZip::setAutoClose() method allows leaving the
- QIODevice open when you close the QuaZip instance.
- * qztest now depends on quazip, no longer breaking the build.
-
---- a/3rdparty/quazip-0.7/doc/html/classQuaZip.html
-+++ b/3rdparty/quazip-0.7/doc/html/classQuaZip.html
-@@ -441,7 +441,7 @@ class </td><td class="memItemRight"
- <p>If the ZIP file is accessed via explicitly set QIODevice, then this device is opened in the necessary mode. If the device was already opened by some other means, then QuaZIP checks if the open mode is compatible to the mode needed for the requested operation. If necessary, seeking is performed to position the device properly.</p>
- <dl class="section return"><dt>Returns</dt><dd><code>true</code> if successful, <code>false</code> otherwise.</dd></dl>
- <dl class="section note"><dt>Note</dt><dd>ZIP/UNZIP API open calls do not return error code - they just return <code>NULL</code> indicating an error. But to make things easier, <a class="el" href="quazip_8h_source.html">quazip.h</a> header defines additional error code <code>UNZ_ERROROPEN</code> and <a class="el" href="classQuaZip.html#a28b91a6282ddd9382c96a069572c6fb4" title="Returns the error code of the last operation. ">getZipError()</a> will return it if the open call of the ZIP/UN [...]
--<p>Argument <em>ioApi</em> specifies IO function set for ZIP/UNZIP package to use. See unzip.h, zip.h and ioapi.h for details. Note that IO API for <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> is different from the original package. The file path argument was changed to be of type <code>voidpf</code>, and <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> passes a QIODevice pointer there. This QIODevice is either set explicitly via <a class= [...]
-+<p>Argument <em>ioApi</em> specifies IO function set for ZIP/UNZIP package to use. See unzip.h, zip.h and ioapi.h for details. Note that IO API for <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> is different from the original package. The file path argument was changed to be of type <code>voidpf</code>, and <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> passes a QIODevice pointer there. This QIODevice is either set explicitly via <a class= [...]
- <dl class="section note"><dt>Note</dt><dd>If the zip64 support is needed, the ioApi argument <em>must</em> be NULL because due to the backwards compatibility issues it can be used to provide a 32-bit API only.</dd>
- <dd>
- If the <a class="el" href="classQuaZip.html#a54bfc924762774ccf9f99be075ba7b0e">no-auto-close</a> feature is used, then the <em>ioApi</em> argument <em>should</em> be NULL because the old API doesn't support the 'fake close' operation, causing slight memory leaks and other possible troubles (like closing the output device in case when an error occurs during opening).</dd></dl>
---- a/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
-+++ b/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
-@@ -285,7 +285,7 @@ QByteArray </td><td class="memItemR
- </div><div class="memdoc">
-
- <p>Last modification date and time. </p>
--<p>This is the time stored in the standard ZIP header. This format only allows to store time with 2-second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the <a class="el" href="structQuaZipFileInfo64.html#af4b19399367cf5bf24026344e0631ccb" title="Returns the NTFS modification time. ">getNTFSmTime()</a> function or its siblings, provided that the archive itself contains these NTFS times. </p>
-+<p>This is the time stored in the standard ZIP header. This format only allows storing time with 2-second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the <a class="el" href="structQuaZipFileInfo64.html#af4b19399367cf5bf24026344e0631ccb" title="Returns the NTFS modification time. ">getNTFSmTime()</a> function or its siblings, provided that the archive itself contains these NTFS times. </p>
-
- <p>Referenced by <a class="el" href="classQuaZip.html#a7ba6daf39263c308c683e7f72f74e0ae">QuaZip::getCurrentFileInfo()</a>, and <a class="el" href="structQuaZipFileInfo64.html#ada29945c7ee4c9df6fbe95864793aade">toQuaZipFileInfo()</a>.</p>
-
---- a/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
-+++ b/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
-@@ -298,7 +298,7 @@ If the Z\-I\-P file is accessed via expl
- \begin{DoxyNote}{Note}
- Z\-I\-P/\-U\-N\-Z\-I\-P A\-P\-I open calls do not return error code -\/ they just return {\ttfamily N\-U\-L\-L} indicating an error. But to make things easier, \doxyref{quazip.\-h}{p.}{quazip_8h_source} header defines additional error code {\ttfamily U\-N\-Z\-\_\-\-E\-R\-R\-O\-R\-O\-P\-E\-N} and \doxyref{get\-Zip\-Error()}{p.}{classQuaZip_a28b91a6282ddd9382c96a069572c6fb4} will return it if the open call of the Z\-I\-P/\-U\-N\-Z\-I\-P A\-P\-I returns {\ttfamily N\-U\-L\-L}.
- \end{DoxyNote}
--Argument {\itshape io\-Api} specifies I\-O function set for Z\-I\-P/\-U\-N\-Z\-I\-P package to use. See unzip.\-h, zip.\-h and ioapi.\-h for details. Note that I\-O A\-P\-I for \doxyref{Qua\-Zip}{p.}{classQuaZip} is different from the original package. The file path argument was changed to be of type {\ttfamily voidpf}, and \doxyref{Qua\-Zip}{p.}{classQuaZip} passes a Q\-I\-O\-Device pointer there. This Q\-I\-O\-Device is either set explicitly via \doxyref{set\-Io\-Device()}{p.}{classQu [...]
-+Argument {\itshape io\-Api} specifies I\-O function set for Z\-I\-P/\-U\-N\-Z\-I\-P package to use. See unzip.\-h, zip.\-h and ioapi.\-h for details. Note that I\-O A\-P\-I for \doxyref{Qua\-Zip}{p.}{classQuaZip} is different from the original package. The file path argument was changed to be of type {\ttfamily voidpf}, and \doxyref{Qua\-Zip}{p.}{classQuaZip} passes a Q\-I\-O\-Device pointer there. This Q\-I\-O\-Device is either set explicitly via \doxyref{set\-Io\-Device()}{p.}{classQu [...]
-
- \begin{DoxyNote}{Note}
- If the zip64 support is needed, the io\-Api argument {\itshape must} be N\-U\-L\-L because due to the backwards compatibility issues it can be used to provide a 32-\/bit A\-P\-I only.
---- a/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
-+++ b/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
-@@ -197,7 +197,7 @@ The N\-T\-F\-S creation time, U\-T\-C
-
- Last modification date and time.
-
--This is the time stored in the standard Z\-I\-P header. This format only allows to store time with 2-\/second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the \doxyref{get\-N\-T\-F\-Sm\-Time()}{p.}{structQuaZipFileInfo64_af4b19399367cf5bf24026344e0631ccb} function or its siblings, provided that the archive itself contains these N\-T\-F\-S times.
-+This is the time stored in the standard Z\-I\-P header. This format only allows storing time with 2-\/second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the \doxyref{get\-N\-T\-F\-Sm\-Time()}{p.}{structQuaZipFileInfo64_af4b19399367cf5bf24026344e0631ccb} function or its siblings, provided that the archive itself contains these N\-T\-F\-S times.
-
- Referenced by Qua\-Zip\-::get\-Current\-File\-Info(), and to\-Qua\-Zip\-File\-Info().
-
---- a/3rdparty/quazip-0.7/quazip/quazip.h
-+++ b/3rdparty/quazip-0.7/quazip/quazip.h
-@@ -173,7 +173,7 @@ class QUAZIP_EXPORT QuaZip {
- * set explicitly via setIoDevice() or the QuaZip(QIODevice*)
- * constructor, or it is created internally when opening the archive
- * by its file name. The default API (qioapi.cpp) just delegates
-- * everything to the QIODevice API. Not only this allows to use a
-+ * everything to the QIODevice API. Not only this allows using a
- * QIODevice instead of file name, but also has a nice side effect
- * of raising the file size limit from 2G to 4G (in non-zip64 archives).
- *
---- a/3rdparty/quazip-0.7/quazip/quazipfile.cpp
-+++ b/3rdparty/quazip-0.7/quazip/quazipfile.cpp
-@@ -70,7 +70,7 @@ class QuaZipFilePrivate {
- /// Sets the zip error.
- /**
- This function is marked as const although it changes one field.
-- This allows to call it from const functions that don't change
-+ This allows calling it from const functions that don't change
- anything by themselves.
- */
- void setZipError(int zipError) const;
---- a/src/QMapControl/mapcontrol.h
-+++ b/src/QMapControl/mapcontrol.h
-@@ -157,7 +157,7 @@ class MapControl : public QWidget
- * The MouesMode Dragging draws an rectangular in the map while the MouseButton is pressed.
- * When the Button is released a draggedRect() signal is emitted.
- *
-- * The second MouseMode (the default) is Panning, which allows to drag the map around.
-+ * The second MouseMode (the default) is Panning, which allows dragging the map around.
- * @param mousemode the MouseMode
- */
- void setMouseMode(MouseMode mousemode);
-@@ -204,7 +204,7 @@ class MapControl : public QWidget
-
- //! Emitted AFTER a MouseEvent occured
- /*!
-- * This signals allows to receive click events within the MapWidget together with the world coordinate.
-+ * This signals allows receiving click events within the MapWidget together with the world coordinate.
- * It is emitted on MousePressEvents and MouseReleaseEvents.
- * The kind of the event can be obtained by checking the events type.
- * @param evnt the QMouseEvent that occured
---- a/translations/README
-+++ b/translations/README
-@@ -3,7 +3,7 @@ templates. Translations can be done usin
- in SVN or using Launchpad (preferred way) at
- https://translations.launchpad.net/merkaartor/trunk
-
--The script in this directory allows to convert between the two XML file types
-+The script in this directory allows converting between the two XML file types
- and the standard gettext .po files.
-
- The templates and the main translations are separated in two different sets
--
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