From 35d929f42b074a75eb344b623ea74e548ca72fb0 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Mon, 30 Nov 2015 18:16:42 +0100
Subject: fix/update AppData files

- make XML tags follow (uptodate) spec
18:23 <ximion> <id type="desktop">libreoffice-draw.desktop</id> =>
               <id>libreoffice-draw.desktop</id>
18:23 <ximion> <application> => <component type="desktop">
- fix license
- add working url/screenshot URLs
---
 .../appstream-appdata/libreoffice-base.appdata.xml      | 17 +++++++++++------
 .../appstream-appdata/libreoffice-calc.appdata.xml      | 16 ++++++++++------
 .../appstream-appdata/libreoffice-draw.appdata.xml      | 17 +++++++++++------
 .../appstream-appdata/libreoffice-impress.appdata.xml   | 16 ++++++++++------
 .../appstream-appdata/libreoffice-writer.appdata.xml    | 17 +++++++++++------
 5 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 8c6390c6c909..6338a374aa5a 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">libreoffice-base.desktop</id>
-<licence>CC0</licence>
+<component type="desktop">
+<id>libreoffice-base.desktop</id>
+<project_license>MPL-2.0</project_license>
+<name>LibreOffice Base</name>
+<summary>database manaager part of the LibreOffice productivity suite</summary>
 <description>
 <p>
 Base is a powerful database manager, part of the LibreOffice productivity suite.
@@ -22,9 +24,12 @@ In addition, the built-in support for JDBC- and ODBC-standard drivers allows you
 to connect to virtually any other existing database engine as well.
 </p>
 </description>
-<url type="homepage">http://www.libreoffice.org/features/base/</url>
+<url type="homepage">http://www.libreoffice.org/discover/base/</url>
 <screenshots>
-<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Base/Screenshot-87.png</screenshot>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png</screenshot>
+<screenshot>http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png</screenshot>
 </screenshots>
+<project_group>The Document Foundation</project_group>
+<developer_name>The Document Foundation</developer_name>
 <updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
-</application>
+</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index 7652fa4c64cf..b8beb7101b7b 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">libreoffice-calc.desktop</id>
-<licence>CC0</licence>
+<component type="desktop">
+<id>libreoffice-calc.desktop</id>
+<project_license>MPL-2.0</project_license>
+<name>LibreOffice Calc</name>
+<summary>spreadsheet program of the LibreOffice productivity suite</summary>
 <description>
 <p>
 Calc is a powerful and extensible spreadsheet program, part of the LibreOffice
@@ -16,9 +18,11 @@ can easily share spreadsheets with users of other popular office suites without
 worrying about compatibility.
 </p>
 </description>
-<url type="homepage">http://www.libreoffice.org/features/calc/</url>
+<url type="homepage">http://www.libreoffice.org/discover/calc/</url>
 <screenshots>
-<screenshot type="default">http://en.wikipedia.org/wiki/File:LibreOffice_Calc_4.0.1_screenshot.png </screenshot>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png</screenshot>
 </screenshots>
+<project_group>The Document Foundation</project_group>
+<developer_name>The Document Foundation</developer_name>
 <updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
-</application>
+</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 0bb1fb701eab..28685983c7d9 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">libreoffice-draw.desktop</id>
-<licence>CC0</licence>
+<component type="desktop">
+<id>libreoffice-draw.desktop</id>
+<project_license>MPL-2.0</project_license>
+<name>LibreOffice Draw</name>
+<summary>graphics editor part of the LibreOffice productivity suite</summary>
 <description>
 <p>
 LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create
@@ -21,9 +23,12 @@ can easily share drawings with users of other popular office suites without
 worrying about compatibility.
 </p>
 </description>
-<url type="homepage">http://www.libreoffice.org/features/draw/</url>
+<url type="homepage">http://www.libreoffice.org/discover/draw/</url>
 <screenshots>
-<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Draw/Screenshot-68.png</screenshot>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png</screenshot>
+<screenshot>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png</screenshot>
 </screenshots>
+<project_group>The Document Foundation</project_group>
+<developer_name>The Document Foundation</developer_name>
 <updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
-</application>
+</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index 04f8ffb1b442..ccb0e9260152 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">libreoffice-impress.desktop</id>
-<licence>CC0</licence>
+<component type="desktop">
+<id>libreoffice-impress.desktop</id>
+<project_license>MPL-2.0</project_license>
+<name>LibreOffice Impress</name>
+<summary>presentation program of the LibreOffice productivity suite</summary>
 <description>
 <p>
 Impress is a presentation program and part of the LibreOffice productivity suite.
@@ -17,9 +19,11 @@ can easily share presentations with users of other popular office suites without
 worrying about compatibility.
 </p>
 </description>
-<url type="homepage">http://www.libreoffice.org/features/impress/</url>
+<url type="homepage">http://www.libreoffice.org/discover/impress/</url>
 <screenshots>
-<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Impress/Screenshot-46.png</screenshot>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png</screenshot>
 </screenshots>
+<project_group>The Document Foundation</project_group>
+<developer_name>The Document Foundation</developer_name>
 <updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
-</application>
+</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index d96c5aff4f78..fbd09a7816ff 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">libreoffice-writer.desktop</id>
-<licence>CC0</licence>
+<component type="desktop">
+<id>libreoffice-writer.desktop</id>
+<project_license>MPL-2.0</project_license>
+<name>LibreOffice Writer</name>
+<summary>word processor part of the LibreOffice productivity suite</summary>
 <description>
 <p>
 Writer is the word processor inside LibreOffice productivity suite.
@@ -23,9 +25,12 @@ can easily share documents with users of other popular office suites without
 worrying about compatibility.
 </p>
 </description>
-<url type="homepage">http://www.libreoffice.org/features/writer/</url>
+<url type="homepage">http://www.libreoffice.org/discover/writer/</url>
 <screenshots>
-<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Writer/Screenshot-99.png</screenshot>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png</screenshot>
+<screenshot>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-03-Technical-Doc-fdo83524.png</screenshot>
 </screenshots>
+<project_group>The Document Foundation</project_group>
+<developer_name>The Document Foundation</developer_name>
 <updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
-</application>
+</component>
-- 
cgit v1.2.3