Merge branch 'feature/issue-998' of https://github.com/x80486/onionshare into x80486-feature/issue-998

4 files changed, 27 insertions, 18 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 71af3740..6861423d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,12 +2,13 @@ include LICENSE
 include README.md
 include BUILD.md
 include share/*
+include share/icons/hicolor/scalable/apps/org.onionshare.OnionShare.svg
 include share/images/*
 include share/locale/*
 include share/templates/*
 include share/static/*
-include install/onionshare.desktop
-include install/onionshare.appdata.xml
+include install/org.onionshare.OnionShare.desktop
+include install/org.onionshare.OnionShare.appdata.xml
 include install/onionshare80.xpm
 include install/scripts/onionshare-nautilus.py
 include tests/*.py
diff --git a/install/onionshare.appdata.xml b/install/org.onionshare.OnionShare.appdata.xml
index 2302a2e8..6ae1b5b6 100644
--- a/install/onionshare.appdata.xml
+++ b/install/org.onionshare.OnionShare.appdata.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2018 Micah Lee <micah@micahflee.com> -->
-<component type="desktop">
-    <id>onionshare.desktop</id>
+<component type="desktop-application">
+    <id>org.onionshare.OnionShare</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0</project_license>
     <name>OnionShare</name>
     <summary>Securely and anonymously share a file of any size</summary>
     <description>
         <p>
-            OnionShare lets you securely and anonymously send and receive files. It works by starting a
-            web server, making it accessible as a Tor onion service, and generating an unguessable web
-            address so others can download files from you, or upload files to you. It does <em>not</em>
-            require setting up a separate server or using a third party file-sharing service.
+            OnionShare lets you securely and anonymously send and receive files. It works by starting a web server,
+            making it accessible as a Tor onion service, and generating an unguessable web address so others can
+            download files from you, or upload files to you. It does <em>not</em> require setting up a separate server
+            or using a third party file-sharing service.
         </p>
         <p>
-            If you want to send files to someone, OnionShare hosts them on your own computer and uses a Tor
-            onion service to make them temporarily accessible over the internet. The receiving user just
-            needs to open the web address in Tor Browser to download the files. If you want to receive files,
-            OnionShare hosts an anonymous dropbox directly on your computer and uses a Tor onion service to
-            make it temporarily accessible over the internet. Other users can upload files to you from by
-            loading the web address in Tor Browser.
+            If you want to send files to someone, OnionShare hosts them on your own computer and uses a Tor onion
+            service to make them temporarily accessible over the internet. The receiving user just needs to open the web
+            address in Tor Browser to download the files. If you want to receive files, OnionShare hosts an anonymous
+            dropbox directly on your computer and uses a Tor onion service to make it temporarily accessible over the
+            internet. Other users can upload files to you from by loading the web address in Tor Browser.
         </p>
     </description>
+    <launchable type="desktop-id">org.onionshare.OnionShare.desktop</launchable>
     <screenshots>
         <screenshot type="default">
             <image>https://raw.githubusercontent.com/micahflee/onionshare/master/screenshots/appdata-onionshare-share-server.png</image>
@@ -40,6 +40,13 @@
             <caption>Uploading files to OnionShare user using Tor Browser</caption>
         </screenshot>
     </screenshots>
+    <url type="bugtracker">https://github.com/micahflee/onionshare/issues/</url>
+    <url type="help">https://github.com/micahflee/onionshare/wiki/</url>
     <url type="homepage">https://onionshare.org/</url>
-    <updatecontact>micah@micahflee.com</updatecontact>
+    <developer_name>Micah Lee</developer_name>
+    <update_contact>micah@micahflee.com</update_contact>
+    <content_rating type="oars-1.1" />
+    <releases>
+        <release type="stable" date="2019-05-07" version="2.1" />
+    </releases>
 </component>
diff --git a/install/onionshare.desktop b/install/org.onionshare.OnionShare.desktop
index 697668db..536d73c6 100644
--- a/install/onionshare.desktop
+++ b/install/org.onionshare.OnionShare.desktop
@@ -7,7 +7,7 @@ Comment[de]=Teile Dateien sicher und anonym über das Tor-Netzwerk
 Exec=/usr/bin/onionshare-gui
 Terminal=false
 Type=Application
-Icon=onionshare80
+Icon=org.onionshare.OnionShare
 Categories=Network;FileTransfer;
 Keywords=tor;anonymity;privacy;onion service;file sharing;file hosting;
 Keywords[da]=tor;anonymitet;privatliv;onion-tjeneste;fildeling;filhosting;
diff --git a/setup.py b/setup.py
index 8aa0f4a0..caaf5a65 100644
--- a/setup.py
+++ b/setup.py
@@ -63,8 +63,9 @@ classifiers = [
         "Environment :: Web Environment"
     ]
 data_files=[
-        (os.path.join(sys.prefix, 'share/applications'), ['install/onionshare.desktop']),
-        (os.path.join(sys.prefix, 'share/metainfo'), ['install/onionshare.appdata.xml']),
+        (os.path.join(sys.prefix, 'share/applications'), ['install/org.onionshare.OnionShare.desktop']),
+        (os.path.join(sys.prefix, 'share/icons/hicolor/scalable/apps'), ['install/org.onionshare.OnionShare.svg']),
+        (os.path.join(sys.prefix, 'share/metainfo'), ['install/org.onionshare.OnionShare.appdata.xml']),
         (os.path.join(sys.prefix, 'share/pixmaps'), ['install/onionshare80.xpm']),
         (os.path.join(sys.prefix, 'share/onionshare'), file_list('share')),
         (os.path.join(sys.prefix, 'share/onionshare/images'), file_list('share/images')),