From 9be566bffe06075c5d0e3c399e3cbd602ff077c0 Mon Sep 17 00:00:00 2001
From: Hunter Turcin <huntertur@gmail.com>
Date: Sun, 12 Jan 2020 11:09:35 -0600
Subject: [PATCH] Convert Appdata file to Appstream (#14620)

---
 .gitignore                                               | 2 +-
 Makefile.am                                              | 2 +-
 ...o.appdata.xml.in => org.xfce.ristretto.appdata.xml.in | 9 +++++++--
 po/POTFILES.in                                           | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename ristretto.appdata.xml.in => org.xfce.ristretto.appdata.xml.in (89%)

diff --git a/.gitignore b/.gitignore
index 4fbb008..d9aecef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,13 +29,13 @@ intltool-merge.in
 intltool-update.in
 missing
 mkinstalldirs
+org.xfce.ristretto.appdata.xml
 po/.intltool-merge-cache
 po/Makefile.in.in
 po/POTFILES
 po/stamp-it
 po/*.gmo
 po/ristretto.pot
-ristretto.appdata.xml
 ristretto.desktop
 stamp-h1
 ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 19b9abe..6b05903 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = ristretto.appdata.xml.in
+appdata_in_files = org.xfce.ristretto.appdata.xml.in
 
 EXTRA_DIST = \
 	autogen.sh \
diff --git a/ristretto.appdata.xml.in b/org.xfce.ristretto.appdata.xml.in
similarity index 89%
rename from ristretto.appdata.xml.in
rename to org.xfce.ristretto.appdata.xml.in
index d3b2e4c..7a17f29 100644
--- a/ristretto.appdata.xml.in
+++ b/org.xfce.ristretto.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Stephan Arts <stephan@xfce.org> -->
-<component type="desktop">
-  <id>ristretto.desktop</id>
+<component type="desktop-application">
+  <id>org.xfce.ristretto</id>
   <metadata_license>CC-BY-3.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>Ristretto</name>
@@ -29,6 +29,10 @@
     </screenshot>
   </screenshots>
 
+  <categories>
+    <category>Graphics</category>
+  </categories>
+
   <url type="homepage">https://docs.xfce.org/apps/ristretto/start</url>
   <url type="bugtracker">https://bugzilla.xfce.org/describecomponents.cgi?product=Ristretto</url>
   <url type="help">https://docs.xfce.org/apps/ristretto/start</url>
@@ -41,4 +45,5 @@
     <binary>ristretto</binary>
   </provides>
 
+  <translation type="gettext">ristretto</translation>
 </component>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91421bd..53eac05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,4 +12,4 @@ src/wallpaper_manager.c
 src/xfce_wallpaper_manager.c
 src/gnome_wallpaper_manager.c
 ristretto.desktop.in
-ristretto.appdata.xml.in
+org.xfce.ristretto.appdata.xml.in
-- 
2.20.1