From 6cb93de9c57fa296fd6d6963ae43ecdbe6b9cd1e Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@cs.stanford.edu>
Date: Tue, 23 Apr 2019 23:10:44 -0700
Subject: [PATCH 1/4] Update app metadata

Add OARS rating
---
 data/edu.stanford.Almond.appdata.xml.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/edu.stanford.Almond.appdata.xml.in b/data/edu.stanford.Almond.appdata.xml.in
index 4cb5f15..179c083 100644
--- a/data/edu.stanford.Almond.appdata.xml.in
+++ b/data/edu.stanford.Almond.appdata.xml.in
@@ -3,7 +3,7 @@
   <id>edu.stanford.Almond.desktop</id>
   <metadata_license>CC0</metadata_license>
   <project_license>GPL-3.0</project_license>
-  <update_contact>mobisocial at lists.stanford.edu</update_contact>
+  <update_contact>thingpedia-admins at lists.stanford.edu</update_contact>
   <name>Almond</name>
   <summary>The Open Virtual Assistant</summary>
   <description>
@@ -12,6 +12,13 @@
     Anyone can contribute support for the favorite service, with few lines of code and a handful of natural language sentences.
     Thingpedia supports more than 50 different services, accounts and IoT devices.</p>
   </description>
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-chat">intense</content_attribute>
+    <content_attribute id="social-info">mild</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+    <content_attribute id="social-location">intense</content_attribute>
+    <content_attribute id="social-contacts">intense</content_attribute>
+  </content_rating>
   <screenshots>
     <screenshot type="default"><image width="640" height="527">https://crowdie.stanford.edu/flatpak/screenshot-main.png</image></screenshot>
     <screenshot><image width="1720" height="1232">https://crowdie.stanford.edu/flatpak/screenshot-xkcd.png</image></screenshot>
@@ -20,7 +27,7 @@
     <screenshot><image width="1984" height="1166">https://crowdie.stanford.edu/flatpak/screenshot-my-rules.png</image></screenshot>
   </screenshots>
   <url type="homepage">https://almond.stanford.edu</url>
-  <url type="bugtracker">https://github.com/Stanford-Mobisocial-IoT-Lab/almond-gnome/issues</url>
+  <url type="bugtracker">https://github.com/stanford-oval/almond-gnome/issues</url>
   <releases>
     <release date="2018-08-21" version="1.1.0">
       <description>

From ec8a74ac9576f58345016c550b4d84fe62cfbd4a Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@cs.stanford.edu>
Date: Tue, 23 Apr 2019 23:13:53 -0700
Subject: [PATCH 2/4] Run metadata through "appstream-util update"

And add some new fields
---
 data/edu.stanford.Almond.appdata.xml.in | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/data/edu.stanford.Almond.appdata.xml.in b/data/edu.stanford.Almond.appdata.xml.in
index 179c083..67723a2 100644
--- a/data/edu.stanford.Almond.appdata.xml.in
+++ b/data/edu.stanford.Almond.appdata.xml.in
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
   <id>edu.stanford.Almond.desktop</id>
-  <metadata_license>CC0</metadata_license>
+  <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <update_contact>thingpedia-admins at lists.stanford.edu</update_contact>
   <name>Almond</name>
   <summary>The Open Virtual Assistant</summary>
+  <developer_name>Stanford Open Virtual Assistant Lab</developer_name>
   <description>
     <p>Almond is a virtual assistant that lets you interact with your services and accounts in natural language, with flexibility and privacy.
     Almond draws its power from the crowdsourced Thingpedia, an open collection of Web and Internet of Things APIs.
@@ -20,14 +21,27 @@
     <content_attribute id="social-contacts">intense</content_attribute>
   </content_rating>
   <screenshots>
-    <screenshot type="default"><image width="640" height="527">https://crowdie.stanford.edu/flatpak/screenshot-main.png</image></screenshot>
-    <screenshot><image width="1720" height="1232">https://crowdie.stanford.edu/flatpak/screenshot-xkcd.png</image></screenshot>
-    <screenshot><image width="1800" height="1072">https://crowdie.stanford.edu/flatpak/screenshot-nytimes.png</image></screenshot>
-    <screenshot><image width="1800" height="1158">https://crowdie.stanford.edu/flatpak/screenshot-my-goods.png</image></screenshot>
-    <screenshot><image width="1984" height="1166">https://crowdie.stanford.edu/flatpak/screenshot-my-rules.png</image></screenshot>
+    <screenshot type="default">
+      <image height="527" width="640">https://crowdie.stanford.edu/flatpak/screenshot-main.png</image>
+    </screenshot>
+    <screenshot>
+      <image height="1232" width="1720">https://crowdie.stanford.edu/flatpak/screenshot-xkcd.png</image>
+    </screenshot>
+    <screenshot>
+      <image height="1072" width="1800">https://crowdie.stanford.edu/flatpak/screenshot-nytimes.png</image>
+    </screenshot>
+    <screenshot>
+      <image height="1158" width="1800">https://crowdie.stanford.edu/flatpak/screenshot-my-goods.png</image>
+    </screenshot>
+    <screenshot>
+      <image height="1166" width="1984">https://crowdie.stanford.edu/flatpak/screenshot-my-rules.png</image>
+    </screenshot>
   </screenshots>
   <url type="homepage">https://almond.stanford.edu</url>
   <url type="bugtracker">https://github.com/stanford-oval/almond-gnome/issues</url>
+  <!--<url type="donation">http://www.homepage.com/donation.html</url>-->
+  <url type="help">https://almond.stanford.edu/thingpedia/developers/thingpedia-intro.md</url>
+  <!--<url type="translate">http://www.homepage.com/how-to-submit-translations.html</url>-->
   <releases>
     <release date="2018-08-21" version="1.1.0">
       <description>

From 951860a58c8a26079480e4d5d770cadd345c18d5 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@cs.stanford.edu>
Date: Tue, 23 Apr 2019 23:16:15 -0700
Subject: [PATCH 3/4] metadata: add translation info

---
 data/edu.stanford.Almond.appdata.xml.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/edu.stanford.Almond.appdata.xml.in b/data/edu.stanford.Almond.appdata.xml.in
index 67723a2..8b967e1 100644
--- a/data/edu.stanford.Almond.appdata.xml.in
+++ b/data/edu.stanford.Almond.appdata.xml.in
@@ -20,6 +20,7 @@
     <content_attribute id="social-location">intense</content_attribute>
     <content_attribute id="social-contacts">intense</content_attribute>
   </content_rating>
+  <translation type="gettext">edu.stanford.Almond</translation>
   <screenshots>
     <screenshot type="default">
       <image height="527" width="640">https://crowdie.stanford.edu/flatpak/screenshot-main.png</image>

From 5f5acd480d29e7197a86b67d6ead01dd32139e7f Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@cs.stanford.edu>
Date: Tue, 23 Apr 2019 23:22:58 -0700
Subject: [PATCH 4/4] appdata: install in /usr/share/metainfo

This is the correct path in newer versions of the spec
---
 data/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/meson.build b/data/meson.build
index ea372f3..c499f6a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,7 +20,7 @@ desktop = intl.merge_file(
 gsettingsdir = join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
 install_data(app_id + '.gschema.xml', install_dir : gsettingsdir)
 
-appdatadir = join_paths(get_option('datadir'), 'appdata')
+appdatadir = join_paths(get_option('datadir'), 'metainfo')
 appdata = intl.merge_file(
   input : app_id + '.appdata.xml.in',
   output : app_id + '.appdata.xml',