From b30eb597911a97d968ebd366f286e21b10b91f30 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Tue, 17 Oct 2017 14:12:02 +0200
Subject: [PATCH] Extend desktop file and name it according to the freedesktop
 specification

---
 share/linux/keepassxc.xml         | 2 +-
 share/linux/org.keepassxc.desktop | 7 +++++--
 snapcraft.yaml                    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/linux/keepassxc.xml b/share/linux/keepassxc.xml
index 757047d2b..b26b4db25 100644
--- a/share/linux/keepassxc.xml
+++ b/share/linux/keepassxc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
   <mime-type type="application/x-keepass2">
-    <comment>KeePass 2 database</comment>
+    <comment>KeePass 2 Database</comment>
     <glob pattern="*.kdbx"/>
     <icon name="application-x-keepassxc"/>
   </mime-type>
diff --git a/share/linux/org.keepassxc.desktop b/share/linux/org.keepassxc.desktop
index 1e72c4f84..fd94fdcd5 100644
--- a/share/linux/org.keepassxc.desktop
+++ b/share/linux/org.keepassxc.desktop
@@ -1,13 +1,16 @@
 [Desktop Entry]
 Name=KeePassXC
-GenericName=Community Password Manager
+GenericName=Password Manager
 GenericName[de]=Passwortverwaltung
 GenericName[es]=Gestor de contraseñas
 GenericName[fr]=Gestionnaire de mot de passe
 GenericName[ru]=менеджер паролей
+Comment=Community-driven port of the Windows application “KeePass Password Safe”
 Exec=keepassxc %f
+TryExec=keepassxc
 Icon=keepassxc
 Terminal=false
 Type=Application
-Categories=Qt;Utility;
+Version=1.0
+Categories=Utility;Security;Qt
 MimeType=application/x-keepass2;
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2b58df287..a3e4004c3 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -42,7 +42,7 @@ parts:
       - libyubikey-dev
       - libykpers-1-dev
     install: |
-      sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/keepassxc.desktop
+      sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.keepassxc.desktop
     after: [desktop-qt5]
 
   # Redefine desktop-qt5 stage packages to work with Ubuntu 17.04