Merge lp:~kalikiana/midori/appdatacopyright into lp:midori

Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6482
Merged at revision: 6483
Proposed branch: lp:~kalikiana/midori/appdatacopyright
Merge into: lp:midori
Diff against target: 31 lines (+7/-7)
1 file modified
data/midori.appdata.xml.in (+7/-7)
To merge this branch: bzr merge lp:~kalikiana/midori/appdatacopyright
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+195495@code.launchpad.net

Commit message

Add copyright note to appdata file

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) wrote :

http://people.freedesktop.org/~hughsient/appdata/

Validation failed!

midori.appdata.xml.in did not validate:

start tag [ul] not allowed from section [p]
incorrect extension, expected '.appdata.xml'

Also there is https://github.com/hughsie/appdata-tools but i dont have glib version to comile

review: Needs Fixing
6482. By Paweł Forysiuk

Don't nest ul in p and drop full stops from list items

This makes validation succeed.

Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/midori.appdata.xml.in'
2--- data/midori.appdata.xml.in 2013-09-08 17:00:36 +0000
3+++ data/midori.appdata.xml.in 2013-11-18 00:57:22 +0000
4@@ -1,4 +1,5 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6+<!-- Copyright 2013 Christian Dywan -->
7 <application>
8 <id type="desktop">midori.desktop</id>
9 <licence>CC0</licence>
10@@ -10,15 +11,14 @@
11 web inspector that is a part of WebKit. Individual pages can easily be turned
12 into web apps and new profiles can be created on demand.
13 </p>
14-<p>A number of extensions are included by default:
15+<p>A number of extensions are included by default:</p>
16 <ul>
17- <li>Adblock with support for ABP filter lists and custom rules is built-in.</li>
18- <li>You can download files with Aria2 or SteadyFlow.</li>
19- <li>User scripts and styles support a la Greasemonkey.</li>
20- <li>Managing cookies and scripts via NoJS and Cookie Security Manager.</li>
21- <li>Switching open tabs in a vertical panel or a popup window.</li>
22+ <li>Adblock with support for ABP filter lists and custom rules is built-in</li>
23+ <li>You can download files with Aria2 or SteadyFlow</li>
24+ <li>User scripts and styles support a la Greasemonkey</li>
25+ <li>Managing cookies and scripts via NoJS and Cookie Security Manager</li>
26+ <li>Switching open tabs in a vertical panel or a popup window</li>
27 </ul>
28-</p>
29 </description>
30 <url type="homepage">http://www.midori-browser.org/</url>
31 <screenshots>

Subscribers

People subscribed via source and target branches

to all changes: