From 4c7a19dbc155e2c8012ffe0a80c634a075120e81 Mon Sep 17 00:00:00 2001
From: Roger Ferrer Ibanez <roger.ferrer@bsc.es>
Date: Mon, 15 Jan 2018 21:51:45 +0000
Subject: [PATCH] Update to latest Appstream spec

Thanks to Michael Biebl for the heads up
---
 configure.ac                            |  2 +-
 src/Makefile.am                         | 10 +++---
 src/eiciel.appdata.xml                  | 41 -------------------------
 src/org.roger-ferrer.Eiciel.appdata.xml | 32 +++++++++++++++++++
 4 files changed, 38 insertions(+), 47 deletions(-)
 delete mode 100644 src/eiciel.appdata.xml
 create mode 100644 src/org.roger-ferrer.Eiciel.appdata.xml

diff --git a/configure.ac b/configure.ac
index f9b38d5..4556234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Set package name and maintainer
-AC_INIT([eiciel],[0.9.11],[rofirrim@gmail.com])
+AC_INIT([eiciel],[0.9.12],[rofirrim@gmail.com])
 
 dnl Where are we
 AC_CANONICAL_BUILD
diff --git a/src/Makefile.am b/src/Makefile.am
index b753102..7160114 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,13 +63,13 @@ endif
 endif
 
 desktopfilesdir=@datadir@/applications
-desktopfiles_DATA=eiciel.desktop
+desktopfiles_DATA=org.roger-ferrer.Eiciel.desktop
 
 
-appdatadir = $(datarootdir)/appdata
-dist_appdata_DATA = eiciel.appdata.xml
+appdatadir = $(datarootdir)/metainfo
+dist_appdata_DATA = org.roger-ferrer.Eiciel.appdata.xml
 
-eiciel.desktop : eiciel.desktop.in
+org.roger-ferrer.Eiciel.desktop : eiciel.desktop.in
 	$(AM_V_GEN)sed -e "s|@DSK_VERSION@|$(VERSION)|;s|@DSK_bindir@|$(bindir)|;s|@DSK_pkgdatadir@|$(pkgdatadir)|" $< > $@
 
 CLEANFILES = 
@@ -80,4 +80,4 @@ CLEANFILES += eiciel.desktop
 
 EXTRA_DIST= \
 	eiciel.desktop.in \
-	eiciel.appdata.xml
+	org.roger-ferrer.Eiciel.appdata.xml
diff --git a/src/eiciel.appdata.xml b/src/eiciel.appdata.xml
deleted file mode 100644
index ffb2aa5..0000000
--- a/src/eiciel.appdata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Roger Ferrer <rofirrim@gmail.com> -->
-<application>
- <id type="desktop">eiciel.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0+</project_license>
- <name>Eiciel</name>
- <summary>Tool to manipulate ACL entries</summary>
- <description>
-  <p>
-   Eiciel is a standalone tool and a Nautilus plugin to graphically
-   edit Access Control Lists (ACL) of your files. ACLs allow to set
-   more fine-grained permissions than the traditional Unix permissions
-   of user, group, other (UGO permissions).
-  </p>
-  <p>
-  Eiciel also allows to edit the extended attributes of files and
-  directories if the filesystem supports it.
-  </p>
-  <p>
-  Not all filesystems support ACLs and extended attributes. And even for
-  those supporting them, they must be enabled (by the system administrator)
-  before using Eiciel.
-  </p>
- </description>
- <screenshots>
-  <screenshot type="default" width="1168" height="657">http://rofi.roger-ferrer.org/eiciel/gfx/shots/screenshot-appdata.png</screenshot>
- </screenshots>
- <url type="homepage">http://rofi.roger-ferrer.org/eiciel/</url>
- <updatecontact>rofirrim@gmail.com</updatecontact>
- <kudos>
-   <kudo>HiDpiIcon</kudo>
-   <kudo>ModernToolkit</kudo>
- </kudos>
- <keywords>
-     <keyword>access control list</keyword>
-     <keyword>ACL</keyword>
-     <keyword>permissions</keyword>
-     <keyword>editor</keyword>
- </keywords>
-</application>
diff --git a/src/org.roger-ferrer.Eiciel.appdata.xml b/src/org.roger-ferrer.Eiciel.appdata.xml
new file mode 100644
index 0000000..7814f5e
--- /dev/null
+++ b/src/org.roger-ferrer.Eiciel.appdata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 Roger Ferrer <rofirrim@gmail.com> -->
+<component type="desktop-application">
+    <id>org.roger-ferrer.Eiciel</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0+</project_license>
+    <name>Eiciel</name>
+    <summary>Tool to manipulate ACL entries</summary>
+    <description>
+        <p>
+            Eiciel is a standalone tool and a Nautilus plugin to graphically
+            edit Access Control Lists (ACL) of your files. ACLs allow to set
+            more fine-grained permissions than the traditional Unix permissions
+            of user, group, other (UGO permissions).
+        </p>
+        <p>
+            Eiciel also allows to edit the extended attributes of files and
+            directories if the filesystem supports it.
+        </p>
+        <p>
+            Not all filesystems support ACLs and extended attributes. And even for
+            those supporting them, they must be enabled (by the system administrator)
+            before using Eiciel.
+        </p>
+    </description>
+    <launchable type="desktop-id">org.roger-ferrer.Eiciel.desktop</launchable>
+ <screenshots>
+  <screenshot type="default" width="1168" height="657">http://rofi.roger-ferrer.org/eiciel/gfx/shots/screenshot-appdata.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://rofi.roger-ferrer.org/eiciel/</url>
+ <developer_name>Roger Ferrer Ibáñez</developer_name>
+</component>