Merge lp:~midori/midori/appdata into lp:midori

[Danielle Foré]

Update Appdata file metadata according to current syntax

* Indent appropriately
* Differentiate between metadata and project licenses
* Add name, summary, icon
* update copyright date

[lp:~midori/midori/appdata]

7058. By Danielle Foré on 2015-11-17

update appstream metadata

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'data/midori.appdata.xml.in'
--- data/midori.appdata.xml.in	2013-11-18 00:55:55 +0000
+++ data/midori.appdata.xml.in	2015-11-17 03:20:35 +0000
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 Christian Dywan -->
+<!-- Copyright 2015 Christian Dywan <[e-mail]> -->
 <application>
-<id type="desktop">midori.desktop</id>
-<licence>CC0</licence>
-<description>
-<p>
-Midori is a fast little WebKit browser with support for HTML5. It can manage
-many open tabs and windows. The URL bar completes history, bookmarks, search
-engines and open tabs out of the box. Web developers can use the powerful
-web inspector that is a part of WebKit. Individual pages can easily be turned
-into web apps and new profiles can be created on demand.
-</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>
-</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>
-</screenshots>
-<updatecontact>[e-mail]</updatecontact>
+  <id type="desktop">midori.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <project_license>LGPL-2.1 and MIT</project_license>
+  <name>Midori</name>
+  <icon type="stock">midori</icon>
+  <summary>A fast and lightweight web browser</summary>
+  <description>
+    <p>
+    Midori is a fast little WebKit browser with support for HTML5. It can manage
+    many open tabs and windows. The URL bar completes history, bookmarks, search
+    engines and open tabs out of the box. Web developers can use the powerful
+    web inspector that is a part of WebKit. Individual pages can easily be turned
+    into web apps and new profiles can be created on demand.
+    </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>
+    </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>
+  </screenshots>
+  <updatecontact>[e-mail]</updatecontact>
 </application>