[merkaartor] 04/06: Drop patches applied upstream. Refresh remaining patch.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository merkaartor.

commit 55c60a019ff734fb0ee1d5c0c867aae3a5d7a738
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 23 22:06:50 2016 +0200

    Drop patches applied upstream. Refresh remaining patch.
---
 debian/changelog                     |  2 +-
 debian/patches/committed-typo.patch  | 27 ---------------------------
 debian/patches/series                |  2 --
 debian/patches/spelling-errors-patch | 28 ----------------------------
 4 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fae4218..2591cb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 merkaartor (0.18.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Add patch to fix spelling errors.
+  * Drop patches applied upstream. Refresh remaining patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 23 Aug 2016 21:57:47 +0200
 
diff --git a/debian/patches/committed-typo.patch b/debian/patches/committed-typo.patch
deleted file mode 100644
index 3dd2954..0000000
--- a/debian/patches/committed-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix 'commited' typo, replace with 'committed'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/merkaartor/pull/113
-Applied-Upstream: https://github.com/openstreetmap/merkaartor/commit/93e0b6365af0bc76560860b0de34e60361abf6cc
-
---- a/src/Sync/SyncListDialog.ui
-+++ b/src/Sync/SyncListDialog.ui
-@@ -56,7 +56,7 @@
-    <item>
-     <widget class="QLabel" name="label">
-      <property name="text">
--      <string>The following changes will be commited:</string>
-+      <string>The following changes will be committed:</string>
-      </property>
-     </widget>
-    </item>
---- a/translations/README.md
-+++ b/translations/README.md
-@@ -13,7 +13,7 @@ The regular workflow is:
-    This pushes the original english strings to Transifex, updating the database and
-    allowing new strings to be downloaded.
- 
--1) Before release, Transifex data should be pulled and commited into the
-+1) Before release, Transifex data should be pulled and committed into the
- repository. This is not necessary, but serves as a backup in case something
- terrible happens to Transifex.
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2c30fa4..2016e86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 qmake-config-nostrip.patch
-committed-typo.patch
-spelling-errors-patch
diff --git a/debian/patches/spelling-errors-patch b/debian/patches/spelling-errors-patch
deleted file mode 100644
index 805f430..0000000
--- a/debian/patches/spelling-errors-patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix spelling errors.
- Reseting -> Resetting
- signle   -> single
-Author: Bas Couwenberg <sebastic at debian.org>
-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