[gthumb] updated appdata

[Paolo Bacchilega <paobac src gnome org>]

commit 15d2ba891bd0faefd356b2d53b032a942554ee5a
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Oct 1 09:39:46 2017 +0200

    updated appdata

 configure.ac                                       |    4 +-
 data/Makefile.am                                   |    6 ++--
 data/appdata/Makefile.am                           |    4 +-
 ...data.xml.in => org.gnome.gThumb.appdata.xml.in} |   30 ++++++++++++++-----
 ...in.in => org.gnome.gThumb.Import.desktop.in.in} |    0
 ...esktop.in.in => org.gnome.gThumb.desktop.in.in} |    0
 po/POTFILES.in                                     |    6 ++--
 7 files changed, 32 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bf971bd..9eeb4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -668,9 +668,9 @@ AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/appdata/Makefile
-data/gthumb.desktop.in
 data/gthumb-${GTHUMB_API_VERSION}.pc:data/gthumb.pc.in
-data/gthumb-import.desktop.in
+data/org.gnome.gThumb.desktop.in
+data/org.gnome.gThumb.Import.desktop.in
 data/icons/Makefile
 data/icons/hicolor/Makefile
 data/icons/hicolor/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 0b2d77b..2ece346 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = appdata icons ui
 
 desktopdir = $(datadir)/applications
-desktop_in_in_files = gthumb.desktop.in.in gthumb-import.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) 
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) 
+desktop_in_in_files = org.gnome.gThumb.desktop.in.in org.gnome.gThumb.Import.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
index bf2a143..45b30dc 100644
--- a/data/appdata/Makefile.am
+++ b/data/appdata/Makefile.am
@@ -1,8 +1,8 @@
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gthumb.appdata.xml.in
+appdata_in_files = org.gnome.gThumb.appdata.xml.in
 EXTRA_DIST = $(appdata_in_files)
 CLEANFILES = $(appdata_DATA)
 
--include $(top_srcdir)/git.mk
\ No newline at end of file
+-include $(top_srcdir)/git.mk
diff --git a/data/appdata/gthumb.appdata.xml.in b/data/appdata/org.gnome.gThumb.appdata.xml.in
similarity index 70%
rename from data/appdata/gthumb.appdata.xml.in
rename to data/appdata/org.gnome.gThumb.appdata.xml.in
index 5afa710..cf9d0ef 100644
--- a/data/appdata/gthumb.appdata.xml.in
+++ b/data/appdata/org.gnome.gThumb.appdata.xml.in
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Paolo Bacchilega <paobac src gnome org> -->
-<application>
-  <id type="desktop">gthumb.desktop</id>
+<!-- Copyright 2014-2017 Paolo Bacchilega <paobac src gnome org> -->
+<component type="desktop-application">
+  <id>org.gnome.gThumb.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
+
+  <_name>gThumb Image Viewer</_name>
+  <_summary>View and organize your images</_summary>
   <description>
     <_p>
       gThumb is an image viewer, editor, browser and organizer.  It is designed
@@ -35,12 +38,19 @@
       for images and save the result as a catalog.
     </_p>
   </description>
+
+  <launchable type="desktop-id">org.gnome.gThumb.desktop</launchable>
+  <url type="homepage">https://wiki.gnome.org/Apps/gthumb</url>
   <screenshots>
-    <screenshot 
type="default">https://git.gnome.org/browse/gthumb/plain/data/appdata/ss-browser.png</screenshot>
-    <screenshot>https://git.gnome.org/browse/gthumb/plain/data/appdata/ss-viewer.png</screenshot>
+    <screenshot type="default">
+      <image type="source">https://git.gnome.org/browse/gthumb/plain/data/appdata/ss-browser.png</image>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://git.gnome.org/browse/gthumb/plain/data/appdata/ss-viewer.png</image>
+    </screenshot>
   </screenshots>
-  <url type="homepage">https://wiki.gnome.org/Apps/gthumb</url>
-  <updatecontact>paobac_at_src.gnome.org</updatecontact>
+
+  <update_contact>paobac_at_src.gnome.org</update_contact>
   <kudos>
     <kudo>AppMenu</kudo>
     <kudo>HiDpiIcon</kudo>
@@ -49,4 +59,8 @@
   </kudos>
   <project_group>GNOME</project_group>
   <translation type="gettext">gthumb</translation>
-</application>
+
+  <provides>
+    <id>org.gnome.gThumb.desktop</id>
+  </provides>
+</component>
diff --git a/data/gthumb-import.desktop.in.in b/data/org.gnome.gThumb.Import.desktop.in.in
similarity index 100%
rename from data/gthumb-import.desktop.in.in
rename to data/org.gnome.gThumb.Import.desktop.in.in
diff --git a/data/gthumb.desktop.in.in b/data/org.gnome.gThumb.desktop.in.in
similarity index 100%
rename from data/gthumb.desktop.in.in
rename to data/org.gnome.gThumb.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fa9a089..7e92d83 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,14 +4,13 @@
 # update the content run the following command:
 # sh update-potfiles.sh > POTFILES.in
 [encoding: UTF-8]
-data/appdata/gthumb.appdata.xml.in
-data/gthumb.desktop.in.in
-data/gthumb-import.desktop.in.in
+data/appdata/org.gnome.gThumb.appdata.xml.in
 [type: gettext/gsettings]data/org.gnome.gthumb.change-date.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.comments.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.contact-sheet.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.convert-format.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.crop.gschema.xml
+data/org.gnome.gThumb.desktop.in.in
 [type: gettext/gsettings]data/org.gnome.gthumb.facebook.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.file-manager.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.flickr.gschema.xml
@@ -19,6 +18,7 @@ data/gthumb-import.desktop.in.in
 [type: gettext/gsettings]data/org.gnome.gthumb.gstreamer-tools.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.image-print.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.image-viewer.gschema.xml
+data/org.gnome.gThumb.Import.desktop.in.in
 [type: gettext/gsettings]data/org.gnome.gthumb.importer.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.photo-importer.gschema.xml
 [type: gettext/gsettings]data/org.gnome.gthumb.picasaweb.gschema.xml