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

Proposed by Blake Kostner
Status: Merged
Approved by: Cody Garver
Approved revision: 7141
Merged at revision: 7141
Proposed branch: lp:~btkostner/midori/appstream
Merge into: lp:midori
Diff against target: 44 lines (+15/-11)
1 file modified
data/midori.appdata.xml.in (+15/-11)
To merge this branch: bzr merge lp:~btkostner/midori/appstream
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+301827@code.launchpad.net

Commit message

appdata: follow new appstream metadata spec

Description of the change

Updates appdata file to use new appstream spec.

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

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

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

Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Copyright 2015 Christian Dywan <christian@twotoasts.de> -->2<!-- Copyright 2015 Christian Dywan <christian@twotoasts.de> -->
3<application>3<component type="desktop">
4 <id type="desktop">midori.desktop</id>4 <id>midori.desktop</id>
5 <metadata_license>CC0</metadata_license>5 <metadata_license>CC0-1.0</metadata_license>
6 <project_license>LGPL-2.1 and MIT</project_license>6 <project_license>LGPL-2.1 and MIT</project_license>
7 <name>Midori</name>7 <name>Midori</name>
8 <icon type="stock">midori</icon>8 <icon type="stock">midori</icon>
@@ -17,16 +17,20 @@
17 </p>17 </p>
18 <p>A number of extensions are included by default:</p>18 <p>A number of extensions are included by default:</p>
19 <ul>19 <ul>
20 <li>Adblock with support for ABP filter lists and custom rules is built-in</li>20 <li>Adblock with support for ABP filter lists and custom rules is built-in</li>
21 <li>You can download files with Aria2 or SteadyFlow</li>21 <li>You can download files with Aria2 or SteadyFlow</li>
22 <li>User scripts and styles support a la Greasemonkey</li>22 <li>User scripts and styles support a la Greasemonkey</li>
23 <li>Managing cookies and scripts via NoJS and Cookie Security Manager</li>23 <li>Managing cookies and scripts via NoJS and Cookie Security Manager</li>
24 <li>Switching open tabs in a vertical panel or a popup window</li>24 <li>Switching open tabs in a vertical panel or a popup window</li>
25 </ul>25 </ul>
26 </description>26 </description>
27 <url type="homepage">http://www.midori-browser.org/</url>27 <url type="homepage">http://www.midori-browser.org/</url>
28 <screenshots>28 <screenshots>
29 <screenshot type="default">http://www.midori-browser.org/images/screenshots/rdio.png</screenshot>29 <screenshot type="default">
30 <image>http://www.midori-browser.org/images/screenshots/rdio.png</image>
31 </screenshot>
30 </screenshots>32 </screenshots>
31 <updatecontact>christian@twotoasts.de</updatecontact>33 <update_contact>christian@twotoasts.de</update_contact>
32</application>34 <developer_name>Christian Dywan</developer_name>
35 <url type="bugtracker">https://bugs.launchpad.net/midori</url>
36</component>

Subscribers

People subscribed via source and target branches

to all changes: