This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor.
commit 7654beeb867919b0079ac9ad331538a561234dfe Author: Bas Couwenberg <[email protected]> Date: Mon Jul 4 12:42:52 2016 +0200 Add patch to fix spelling errors. --- debian/changelog | 6 ++++++ debian/patches/series | 1 + debian/patches/spelling-errors-patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8c68e7c..e7e409d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +merkaartor (0.18.3~rc1-1~exp2) UNRELEASED; urgency=medium + + * Add patch to fix spelling errors. + + -- Bas Couwenberg <[email protected]> Mon, 04 Jul 2016 12:19:23 +0200 + merkaartor (0.18.3~rc1-1~exp1) experimental; urgency=medium * New upstream release candidate. diff --git a/debian/patches/series b/debian/patches/series index 276b615..2c30fa4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ qmake-config-nostrip.patch committed-typo.patch +spelling-errors-patch diff --git a/debian/patches/spelling-errors-patch b/debian/patches/spelling-errors-patch new file mode 100644 index 0000000..805f430 --- /dev/null +++ b/debian/patches/spelling-errors-patch @@ -0,0 +1,28 @@ +Description: Fix spelling errors. + Reseting -> Resetting + signle -> single +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/openstreetmap/merkaartor/pull/116 + +--- a/src/Commands/Command.cpp ++++ b/src/Commands/Command.cpp +@@ -557,7 +557,7 @@ CommandHistory* CommandHistory::fromXML( + } + + if (!OK) { +- qDebug() << "!! File history is corrupted. Reseting..."; ++ qDebug() << "!! File history is corrupted. Resetting..."; + qDebug() << "-- Size: " << h->Size; + qDebug() << "-- Index: " << h->Index; + delete h; +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -333,7 +333,7 @@ v0.15 + * FIX : No name in for gpx track layer in Layers menu after File -> Import. Patch by Trav (closes #2661) + * CHG : Keep directional arrows blue for oneway roads in "Show directional arrows - Always" mode. + * ADD : GeoTIFF background plugin (closes #1025) +- * ADD : Grabbing hand icon in signle mouse mode ++ * ADD : Grabbing hand icon in single 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 canceling most operation with a right-click + * ADD : "Zoom lock" mode. Zoom steps are locked to TMS ones and projection is locked to Mercator -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
