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

[Cris Dywan]

Provide and install .appdata.xml file for app stores

While at it, I refreshed the text we have in the README to be a little less like a technical listing and updated it a bit. Text in the README and appdata are the same.

[lp:~kalikiana/midori/appdata]

6384. By Cris Dywan on 2013-09-08

Restructure extension descriptions into a list

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'README'
--- README	2013-06-20 21:11:52 +0000
+++ README	2013-09-08 17:01:23 +0000
@@ -1,20 +1,23 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
-Midori is a lightweight web browser.
-
-* Full integration with GTK+2 and GTK+3.
-* Fast rendering with WebKit and HTML5 video with GStreamer.
-* Tabs, windows and session management.
-* History completion and configurable Web Search.
-* User scripts and user styles support.
-* Adblock Plus compatible, external download manager support.
-* Straightforward bookmark management.
-* Customizable interface, extensions written in C and Vala.
-
-Requirements: GLib 2.22, GTK+ 2.24, WebkitGTK+ 1.8.3, libXML2,
-              libsoup 2.27.90, sqlite 3.0, Vala 0.14, libnotify
-
-Optional: GTK+ 3.0, Unique 0.9, gcr, Granite 0.2, WebKit2GTK+ 1.11.91/ 2.0.0
+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.
+
+A number of extensions are included by default:
+
+* Adblock with support for ABP filter lists and custom rules is built-in.
+* You can download files with Aria2 or SteadyFlow.
+* User scripts and styles support a la Greasemonkey.
+* Managing cookies and scripts via NoJS and Cookie Security Manager.
+* Switching open tabs in a vertical panel or a popup window.
+
+Requirements: GLib 2.32.3, GTK+ 2.24, WebkitGTK+ 1.8.3, libXML2,
+              libsoup 2.27.90, sqlite 3.0, Vala 0.16, libnotify
+
+Optional: GTK+ 3.0, gcr, Granite 0.2, WebKit2GTK+ 1.11.91/ 2.0.0
 
 For installation instructions read INSTALL.
 
@@ -24,4 +27,4 @@
 And join the IRC channel #midori on irc.freenode.net
 
 Check for new versions at:
-    http://www.twotoasts.de
+    http://www.midori-browser.org

=== modified file 'cmake/FindIntltool.cmake'
--- cmake/FindIntltool.cmake	2013-08-22 23:21:29 +0000
+++ cmake/FindIntltool.cmake	2013-09-08 17:01:23 +0000
@@ -17,6 +17,14 @@
         install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${desktop_id}.desktop"
                  DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
     endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
+    macro (INTLTOOL_MERGE_APPDATA desktop_id po_dir)
+        add_custom_target ("${desktop_id}.appdata.xml" ALL
+            ${INTLTOOL_MERGE_EXECUTABLE} --xml-style ${CMAKE_SOURCE_DIR}/${po_dir}
+                ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.appdata.xml.in ${desktop_id}.appdata.xml
+        )
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${desktop_id}.appdata.xml"
+                 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+         endmacro (INTLTOOL_MERGE_APPDATA desktop_id po_dir)
 endif ()
 
 if (INTLTOOL_UPDATE_EXECUTABLE)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-09-01 21:08:28 +0000
+++ data/CMakeLists.txt	2013-09-08 17:01:23 +0000
@@ -14,10 +14,15 @@
     string(FIND ${FILE} "faq." FAQ_FILE)
     string(FIND ${FILE} "midori." MIDORI_FILE)
     string(FIND ${FILE} ".desktop" DESKTOP_FILE)
+    string(FIND ${FILE} ".appdata.xml" APPDATA_FILE)
     if (FAQ_FILE GREATER -1)
     elseif (DESKTOP_FILE GREATER -1 AND NOT WIN32)
         string(SUBSTRING ${FILE} 0 ${DESKTOP_FILE} DESKTOP_ID)
         INTLTOOL_MERGE_DESKTOP (${DESKTOP_ID} po)
+    elseif (APPDATA_FILE GREATER -1 AND NOT WIN32)
+        string(SUBSTRING ${FILE} 0 ${APPDATA_FILE} DESKTOP_ID)
+        INTLTOOL_MERGE_APPDATA (${DESKTOP_ID} po)
+        # install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata/)
     elseif(MIDORI_FILE GREATER -1)
     else()
         string(FIND ${FILE} "/" IS_DIR)

=== added file 'data/midori.appdata.xml.in'
--- data/midori.appdata.xml.in	1970-01-01 00:00:00 +0000
+++ data/midori.appdata.xml.in	2013-09-08 17:01:23 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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:
+<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>
+</p>
+</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>