[qmapshack] 06/07: Drop debugging-typo.patch, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Feb 25 21:52:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit 4b53eca4cc180d3d7d70e363c6e0862280dd8836
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Feb 25 21:53:34 2016 +0100
Drop debugging-typo.patch, applied upstream.
Refresh original-typo.patch, partially applied upstream.
---
debian/changelog | 2 +
debian/patches/debugging-typo.patch | 15 ----
debian/patches/original-typo.patch | 138 +-----------------------------------
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 153 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8c6b1c..129023d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qmapshack (1.6.0-1) UNRELEASED; urgency=medium
* Update copyright files, changes:
- Update copyright years for Oliver Eichler & Christian Eichler
- Add Peter Schumann & Ivo Kronenberg to copyright holders
+ * Drop debugging-typo.patch, applied upstream.
+ Refresh original-typo.patch, partially applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Thu, 25 Feb 2016 21:28:38 +0100
diff --git a/debian/patches/debugging-typo.patch b/debian/patches/debugging-typo.patch
deleted file mode 100644
index c3ae742..0000000
--- a/debian/patches/debugging-typo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix 'debuging' typo, replace with 'debugging'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bitbucket.org/maproom/qmapshack/issues/107/patches-for-original-debugging-typos
-
---- a/qmapshack.1
-+++ b/qmapshack.1
-@@ -33,7 +33,7 @@ Main features:
- .SH OPTIONS
- .TP
- \fB\-d\fR, \fB\-\-debug\fR
--Run with debuging output.
-+Run with debugging output.
- .TP
- \fB\-h\fR, \fB\-\-help\fR
- Displays the help message.
diff --git a/debian/patches/original-typo.patch b/debian/patches/original-typo.patch
index ae3456a..1fe1ca5 100644
--- a/debian/patches/original-typo.patch
+++ b/debian/patches/original-typo.patch
@@ -3,114 +3,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://bitbucket.org/maproom/qmapshack/issues/107/patches-for-original-debugging-typos
Applied-Upstream: https://bitbucket.org/maproom/qmapshack/commits/111995e135a6239bfa43026f0e14c596766b75de
---- a/src/locale/qmapshack_cs.ts
-+++ b/src/locale/qmapshack_cs.ts
-@@ -1756,7 +1756,7 @@ Neznámá stavba.</translation>
- <translation type="unfinished"></translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="vanished">Tímto budou všechny původní údaje nahrazeny jednoduchou čárou souřadnic. Všechna ostatní data budou trvale ztracena.</translation>
- </message>
- </context>
-@@ -4457,7 +4457,7 @@ Nechce se mi číst dokumentaci!</transl
- <translation type="obsolete">Varování!</translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="obsolete">Tímto budou všechny původní údaje nahrazeny jednoduchou čárou souřadnic. Všechna ostatní data budou trvale ztracena.</translation>
- </message>
- <message>
-@@ -4897,7 +4897,7 @@ nebo
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="53"/>
-- <source>Save to orignal</source>
-+ <source>Save to original</source>
- <translation>Uložit do předlohy</translation>
- </message>
- <message>
---- a/src/locale/qmapshack_de.ts
-+++ b/src/locale/qmapshack_de.ts
-@@ -1810,7 +1810,7 @@ Unbekannte Struktur.</translation>
- <translation type="obsolete">Warnung!</translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="obsolete">Alle ursprünglichen Daten werden durch eine einfache Koordinatenlinie ersetzt. Alle anderen Daten sind dauerhaft verloren.</translation>
- </message>
- </context>
-@@ -1860,7 +1860,7 @@ Unbekannte Struktur.</translation>
- <translation>Alle ursprünglichen Daten werden durch eine einfache Koordinatenlinie ersetzt. Alle anderen Daten sind dauerhaft verloren.</translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="vanished">Alle ursprünglichen Daten werden durch eine einfache Koordinatenlinie ersetzt. Alle anderen Daten sind dauerhaft verloren.</translation>
- </message>
- </context>
-@@ -4608,7 +4608,7 @@ Keine Lust die Anleitung zu lesen!</tran
- <translation type="obsolete">Warnung!</translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="obsolete">Alle ursprünglichen Daten werden durch eine einfache Koordinatenlinie ersetzt. Alle anderen Daten sind dauerhaft verloren.</translation>
- </message>
- <message>
-@@ -5053,7 +5053,7 @@ sein</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="53"/>
-- <source>Save to orignal</source>
-+ <source>Save to original</source>
- <translation>Ins Original speichern</translation>
- </message>
- <message>
---- a/src/locale/qmapshack_es.ts
-+++ b/src/locale/qmapshack_es.ts
-@@ -1743,7 +1743,7 @@ Estructura desconocida.</translation>
- <translation type="unfinished"></translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="obsolete">Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
- </message>
- </context>
-@@ -4414,7 +4414,7 @@ I don't want to read the documentat
- <translation type="obsolete">¡Cuidado!</translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="obsolete">Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
- </message>
- <message>
-@@ -4850,7 +4850,7 @@ o
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="53"/>
-- <source>Save to orignal</source>
-+ <source>Save to original</source>
- <translation>Guardar al original</translation>
- </message>
- <message>
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
-@@ -1680,7 +1680,7 @@ Structure inconnue.</translation>
- <translation type="unfinished"></translation>
- </message>
- <message>
-- <source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
-+ <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation type="vanished">Ceci remplacera les données de l'original par une ligne simple de coordonnées. Toutes les autres données seront définitivement perdues.</translation>
- </message>
- </context>
-@@ -4313,7 +4313,7 @@ Je n'ai pas envie de lire la docume
+@@ -6028,7 +6028,7 @@ Je n'ai pas envie de lire la docume
<translation type="obsolete">Avertissement !</translation>
</message>
<message>
@@ -119,34 +14,3 @@ Applied-Upstream: https://bitbucket.org/maproom/qmapshack/commits/111995e135a623
<translation type="obsolete">Ceci remplacera les données de l'original par une ligne simple de coordonnées. Toutes les autres données seront définitivement perdues.</translation>
</message>
<message>
-@@ -4748,7 +4748,7 @@ or
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="53"/>
-- <source>Save to orignal</source>
-+ <source>Save to original</source>
- <translation>Enregistrer</translation>
- </message>
- <message>
---- a/src/locale/qmapshack_nl.ts
-+++ b/src/locale/qmapshack_nl.ts
-@@ -4674,7 +4674,7 @@ of
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="53"/>
-- <source>Save to orignal</source>
-+ <source>Save to original</source>
- <translation>Opslaan als origineel</translation>
- </message>
- <message>
---- a/src/mouse/line/IScrOptEditLine.ui
-+++ b/src/mouse/line/IScrOptEditLine.ui
-@@ -50,7 +50,7 @@
- <item>
- <widget class="QPushButton" name="pushSaveOrig">
- <property name="text">
-- <string>Save to orignal</string>
-+ <string>Save to original</string>
- </property>
- </widget>
- </item>
diff --git a/debian/patches/series b/debian/patches/series
index 53f973b..b8df511 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
routino-version.patch
original-typo.patch
-debugging-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list