[Pkg-gnupg-commit] [gpa] 08/10: Spelling fix from upstream, cleaned up gpa.desktop

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gpa.

commit 635ffc717abc511d4eddf402f6ac98c66db2778a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Feb 6 00:19:55 2018 -0500

    Spelling fix from upstream, cleaned up gpa.desktop
---
 debian/patches/0005-Fix-typo.patch             | 24 +++++++++++++++++++++
 debian/patches/0006-Clean-up-gpa.desktop.patch | 30 ++++++++++++++++++++++++++
 debian/patches/series                          |  2 ++
 3 files changed, 56 insertions(+)

diff --git a/debian/patches/0005-Fix-typo.patch b/debian/patches/0005-Fix-typo.patch
new file mode 100644
index 0000000..dc99d7f
--- /dev/null
+++ b/debian/patches/0005-Fix-typo.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Andreas_R=C3=B6nnquist?= <gusnan at openmailbox.org>
+Date: Mon, 21 Nov 2016 18:49:48 +0100
+Subject: Fix typo.
+
+--
+Signed-off-by: Justus Winter <justus at g10code.com>
+(cherry picked from commit dc05f46e07626d468d090564fec23cc598368589)
+---
+ src/cm-netkey.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cm-netkey.c b/src/cm-netkey.c
+index 656010b..5f027cc 100644
+--- a/src/cm-netkey.c
++++ b/src/cm-netkey.c
+@@ -642,7 +642,7 @@ change_nullpin (GpaCMNetkey *card)
+        "initial PIN is <b>required but can't be reverted</b>.\n\n"
+        "Please check the documentation of your card to learn "
+        "for what the NullPIN is good.\n\n"
+-       "If you proceeed you will be asked to enter a new PIN "
++       "If you proceed you will be asked to enter a new PIN "
+        "and later to repeat that PIN.  Make sure that you "
+        "will remember that PIN - it will not be possible to "
+        "recover the PIN if it has been entered wrongly more "
diff --git a/debian/patches/0006-Clean-up-gpa.desktop.patch b/debian/patches/0006-Clean-up-gpa.desktop.patch
new file mode 100644
index 0000000..a507154
--- /dev/null
+++ b/debian/patches/0006-Clean-up-gpa.desktop.patch
@@ -0,0 +1,30 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Tue, 6 Feb 2018 00:17:35 -0500
+Subject: Clean up gpa.desktop
+
+desktop-file-validate says:
+
+  warning: value "GTK;Application;Security;Utility;" for key
+  "Categories" in group "Desktop Entry" contains a deprecated value
+  "Application"
+
+So i removed Application.
+
+I added Keywords= because of
+https://wiki.gnome.org/Initiatives/GnomeGoals/DesktopFileKeywords
+---
+ gpa.desktop | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gpa.desktop b/gpa.desktop
+index abeffe5..82dd888 100644
+--- a/gpa.desktop
++++ b/gpa.desktop
+@@ -9,5 +9,6 @@ Exec=gpa %f
+ Icon=gpa
+ Terminal=false
+ Type=Application
+-Categories=GTK;Application;Security;Utility;
++Categories=GTK;Security;Utility;
+ MimeType=application/pgp-encrypted;application/pgp-signature
++Keywords=security;keys;encryption;crypto;privacy;
diff --git a/debian/patches/series b/debian/patches/series
index 236f1d0..40fa169 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ gnupg2.patch
 0002-Add-mimetimes-to-gpa.desktop.patch
 0003-Fix-crash-on-filename-conversion-error.patch
 0004-Fix-listing-of-algorithm-keysize-in-the-subkey-windo.patch
+0005-Fix-typo.patch
+0006-Clean-up-gpa.desktop.patch

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