This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack.
commit 9255b09508bb65bccce91dffbb22bafcf35c47bf Author: Bas Couwenberg <[email protected]> Date: Tue Sep 13 10:05:38 2016 +0200 Drop original-typo.patch, applied upstream. --- debian/changelog | 1 + debian/patches/original-typo.patch | 16 ---------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3f259e..5ea5442 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qmapshack (1.7.0-1) UNRELEASED; urgency=medium * New upstream release. * Disable icon regeneration on hurd-i386, inkscape fails there too. * Update copyright file, add Rainer Woitok to copyright holders. + * Drop original-typo.patch, applied upstream. -- Bas Couwenberg <[email protected]> Tue, 13 Sep 2016 09:52:11 +0200 diff --git a/debian/patches/original-typo.patch b/debian/patches/original-typo.patch deleted file mode 100644 index 48cdf28..0000000 --- a/debian/patches/original-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix 'orignal' typo, replace with 'original'. -Author: Bas Couwenberg <[email protected]> -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_fr.ts -+++ b/src/locale/qmapshack_fr.ts -@@ -6416,7 +6416,7 @@ Je n'ai pas envie de lire la docume - <translation type="obsolete">Avertissement !</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">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> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7cc6c18..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -original-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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
