From 280b7fd7ef70e9761ee279dff75cb097633caf41 Mon Sep 17 00:00:00 2001
From: Andre Miranda <andreldm@xfce.org>
Date: Wed, 22 Aug 2018 21:40:49 -0300
Subject: [PATCH] Convert AppData file to AppStream (Bug #14624)

---
 .gitignore                                            |  2 +-
 data/Makefile.am                                      |  4 ++--
 ...xml.in => org.xfce.xfce4-appfinder.appdata.xml.in} | 11 ++++++-----
 po/POTFILES.in                                        |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename data/{xfce4-appfinder.appdata.xml.in => org.xfce.xfce4-appfinder.appdata.xml.in} (72%)

diff --git a/.gitignore b/.gitignore
index 05ba810..05e66a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ config.status
 config.sub
 configure
 configure.ac
-data/xfce4-appfinder.appdata.xml
+data/org.xfce.xfce4-appfinder.appdata.xml
 data/xfce4-appfinder.desktop
 data/xfce4-run.desktop
 depcomp
diff --git a/data/Makefile.am b/data/Makefile.am
index 17ad9b6..a2da2a3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,9 +10,9 @@ apps_DATA = $(apps_in_files:.desktop.in=.desktop)
 # .appdata
 #
 @INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = xfce4-appfinder.appdata.xml.in
+appdata_in_files = org.xfce.xfce4-appfinder.appdata.xml
 
 EXTRA_DIST = \
 	$(apps_in_files)	\
diff --git a/data/xfce4-appfinder.appdata.xml.in b/data/org.xfce.xfce4-appfinder.appdata.xml.in
similarity index 72%
rename from data/xfce4-appfinder.appdata.xml.in
rename to data/org.xfce.xfce4-appfinder.appdata.xml.in
index 41c8549..83b0403 100644
--- a/data/xfce4-appfinder.appdata.xml.in
+++ b/data/org.xfce.xfce4-appfinder.appdata.xml.in
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Eric Koegel <eric.koegel@gmail.com> and Simon Steinbeiss <simon@xfce.org> -->
+<!-- Copyright 2018 Andre Miranda <andreldm@xfce.org> -->
 <component type="desktop">
   <id>xfce4-appfinder.desktop</id>
   <metadata_license>CC-BY-3.0</metadata_license>
@@ -16,17 +17,17 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>http://docs.xfce.org/_media/xfce/xfce4-appfinder/xfce4-appfinder-expanded.png</image>
+      <image>https://docs.xfce.org/_media/xfce/xfce4-appfinder/xfce4-appfinder-expanded.png</image>
     </screenshot>
   </screenshots>
 
-  <url type="homepage">http://www.xfce.org/</url>
+  <url type="homepage">https://www.xfce.org/</url>
   <url type="bugtracker">https://bugzilla.xfce.org/</url>
-  <url type="help">http://docs.xfce.org/xfce/xfce4-appfinder/start</url>
+  <url type="help">https://docs.xfce.org/xfce/xfce4-appfinder/start</url>
 
+  <project_group>Xfce</project_group>
   <updatecontact>xfce4-dev@xfce.org</updatecontact>
-
-  <project_group>XFCE</project_group>
+  <translation type="gettext">xfce4-appfinder</translation>
 
   <provides>
     <binary>xfce4-appfinder</binary>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f60bb7..f0bd0ee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,4 +11,4 @@ src/appfinder-preferences.glade
 
 data/xfce4-appfinder.desktop.in
 data/xfce4-run.desktop.in
-data/xfce4-appfinder.appdata.xml.in
+data/org.xfce.xfce4-appfinder.appdata.xml.in
-- 
2.18.0