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

sebastic-guest pushed a commit to branch master
in repository qmapshack.

commit ea80a4067d44a9e781d18ba02bc85984e5730039
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Mon Jan 19 09:17:11 2015 +0100

    Drop artificial-typo.patch, applied upstream.
---
 debian/changelog                     |  1 +
 debian/patches/artificial-typo.patch | 49 ------------------------------------
 debian/patches/series                |  1 -
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f182268..d844c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qmapshack (0.11.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop artificial-typo.patch, applied upstream.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Mon, 19 Jan 2015 09:16:19 +0100
 
diff --git a/debian/patches/artificial-typo.patch 
b/debian/patches/artificial-typo.patch
deleted file mode 100644
index 27b8960..0000000
--- a/debian/patches/artificial-typo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Fix 'artifical' typo, replace with 'artificial'.
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: 
https://bitbucket.org/maproom/qmapshack/pull-request/1/fix-artifical-typo-replace-with-artificial/diff
-Applied-Upstream: 
https://bitbucket.org/maproom/qmapshack/commits/2a41c7fe11e2cbbbd4ad082b4bf01841ada94c4c
-
---- a/src/gis/trk/filter/filter.cpp
-+++ b/src/gis/trk/filter/filter.cpp
-@@ -293,7 +293,7 @@ void CGisItemTrk::filterObscureDate(int
-         }
- 
-         deriveSecondaryData();
--        changed(QObject::tr("Set artifical timestamps with delta of %1 
sec.").arg(delta), "://icons/48x48/Time.png");
-+        changed(QObject::tr("Set artificial timestamps with delta of %1 
sec.").arg(delta), "://icons/48x48/Time.png");
-     }
- }
- 
---- a/src/locale/qmapshack_cs.ts
-+++ b/src/locale/qmapshack_cs.ts
-@@ -4318,7 +4318,7 @@ Filename: %1</source>
-     </message>
-     <message>
-         <location filename="../gis/trk/filter/filter.cpp" line="296"/>
--        <source>Set artifical timestamps with delta of %1 sec.</source>
-+        <source>Set artificial timestamps with delta of %1 sec.</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
---- a/src/locale/qmapshack_de.ts
-+++ b/src/locale/qmapshack_de.ts
-@@ -4433,7 +4433,7 @@ Dateiname: %1</translation>
-     </message>
-     <message>
-         <location filename="../gis/trk/filter/filter.cpp" line="296"/>
--        <source>Set artifical timestamps with delta of %1 sec.</source>
-+        <source>Set artificial timestamps with delta of %1 sec.</source>
-         <translation>K√ľnstliche Zeitmarken mit einem Abstand von %1 Sek. 
gesetzt.</translation>
-     </message>
-     <message>
---- a/src/locale/qmapshack_es.ts
-+++ b/src/locale/qmapshack_es.ts
-@@ -4277,7 +4277,7 @@ Filename: %1</source>
-     </message>
-     <message>
-         <location filename="../gis/trk/filter/filter.cpp" line="296"/>
--        <source>Set artifical timestamps with delta of %1 sec.</source>
-+        <source>Set artificial timestamps with delta of %1 sec.</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
diff --git a/debian/patches/series b/debian/patches/series
index 2e38cda..60365d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-desktop.patch
-artificial-typo.patch

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to