Merge lp:~btkostner/midori/appstream into lp:midori

[Blake Kostner]

appdata: follow new appstream metadata spec

Updates appdata file to use new appstream spec.

See url for more details:
https://freedesktop.org/software/appstream/docs/chap-Quickstart.html

[RabbitBot (rabbitbot-a)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'data/midori.appdata.xml.in'
--- data/midori.appdata.xml.in	2015-11-17 03:20:10 +0000
+++ data/midori.appdata.xml.in	2016-08-02 19:47:22 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2015 Christian Dywan <[e-mail]> -->
-<application>
-  <id type="desktop">midori.desktop</id>
-  <metadata_license>CC0</metadata_license>
+<component type="desktop">
+  <id>midori.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1 and MIT</project_license>
   <name>Midori</name>
   <icon type="stock">midori</icon>
@@ -17,16 +17,20 @@
     </p>
     <p>A number of extensions are included by default:</p>
     <ul>
-        <li>Adblock with support for ABP filter lists and custom rules is built-in</li>
-        <li>You can download files with Aria2 or SteadyFlow</li>
-        <li>User scripts and styles support a la Greasemonkey</li>
-        <li>Managing cookies and scripts via NoJS and Cookie Security Manager</li>
-        <li>Switching open tabs in a vertical panel or a popup window</li>
+      <li>Adblock with support for ABP filter lists and custom rules is built-in</li>
+      <li>You can download files with Aria2 or SteadyFlow</li>
+      <li>User scripts and styles support a la Greasemonkey</li>
+      <li>Managing cookies and scripts via NoJS and Cookie Security Manager</li>
+      <li>Switching open tabs in a vertical panel or a popup window</li>
     </ul>
   </description>
   <url type="homepage">http://www.midori-browser.org/</url>
   <screenshots>
-      <screenshot type="default">http://www.midori-browser.org/images/screenshots/rdio.png</screenshot>
+    <screenshot type="default">
+      <image>http://www.midori-browser.org/images/screenshots/rdio.png</image>
+    </screenshot>
   </screenshots>
-  <updatecontact>[e-mail]</updatecontact>
-</application>
+  <update_contact>[e-mail]</update_contact>
+  <developer_name>Christian Dywan</developer_name>
+  <url type="bugtracker">https://bugs.launchpad.net/midori</url>
+</component>