Addl Fix #742: Add appdata file

https://github.com/BestImageViewer/geeqie/pull/742

Install appdata file to /usr/share/metainfo
Enable language translations
Move screenshots to temporary location

diff --git a/Makefile.am b/Makefile.am
index df71fe9..2736004 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,19 +23,26 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 icondir = $(datadir)/pixmaps
 icon_DATA = geeqie.png
 
+# Location defined by freedesktop.org
+appdatadir = /usr/share/metainfo
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = org.geeqie.Geeqie.appdata.xml.in
+@INTLTOOL_XML_RULE@
+
 EXTRA_DIST = \
        $(readme_DATA)  \
        $(desktop_in_files)     \
        $(icon_DATA)    \
        geeqie.spec.in  \
        geeqie.1        \
-       doxygen.conf
+       doxygen.conf    \
+       $(appdata_in_files)
 
 dist-hook: geeqie.spec
        cp $(top_builddir)/geeqie.spec $(distdir)
 
 DISTCLEANFILES = config.report
-CLEANFILES = $(desktop_DATA) ChangeLog.html
+CLEANFILES = $(desktop_DATA) ChangeLog.html $(appdata_DATA)
 
 .PHONY: ChangeLog
 ChangeLog.html:

diff --git a/org.geeqie.Geeqie.appdata.xml b/org.geeqie.Geeqie.appdata.xml.in
similarity index 70%
rename from org.geeqie.Geeqie.appdata.xml
rename to org.geeqie.Geeqie.appdata.xml.in
index 92822a6..da33191 100644 (file)
--- a/org.geeqie.Geeqie.appdata.xml
+++ b/org.geeqie.Geeqie.appdata.xml.in
@@ -4,22 +4,22 @@
   <metadata_license>CC-BY-SA-4.0</metadata_license>
   <content_rating type="oars-1.1" />
   <project_license>GPL-3.0+</project_license>
-  <name>Geeqie</name>
-  <summary>A lightweight image viewer.</summary>
+  <_name>Geeqie</_name>
+  <_summary>A lightweight image viewer</_summary>
   <description>
-    <p>
+    <_p>
           Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
-        </p>
-    <p>
+        </_p>
+    <_p>
           It can be used as a simple, fast, database-free image viewer, but equally it can be used to manage large collections of images.
-        </p>
+        </_p>
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.geeqie.org/screenshots/Screenshot_2017-08-13_12-02-32.png</image>
+      <image>http://cclark.uk/geeqie/screenshots/Screenshot_2017-08-13_12-02-32_rescaled.png</image>
     </screenshot>
     <screenshot>
-      <image>http://www.geeqie.org/screenshots/Screenshot_2017-08-13_12-29-44.png</image>
+      <image>http://cclark.uk/geeqie/screenshots/Screenshot_2017-08-13_12-29-44_rescaled.png</image>
     </screenshot>
   </screenshots>
   <releases>
@@ -33,4 +33,6 @@
   </keywords>
   <url type="homepage">http://geeqie.org</url>
   <update_contact>geeqie@freelists.org</update_contact>
-</component>
\ No newline at end of file
+  <translation type="gettext">geeqie</translation>
+</component>
+

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 027943f..85b2589 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,13 @@
 geeqie.desktop.in
-plugins/export-jpeg/export-jpeg.desktop.in
-plugins/tethered-photography/tethered-photography.desktop.in
+org.geeqie.Geeqie.appdata.xml.in
 plugins/camera-import/camera-import.desktop.in
+plugins/export-jpeg/export-jpeg.desktop.in
 plugins/image-crop/image-crop.desktop.in
 plugins/random-image/random-image.desktop.in
 plugins/rotate/rotate.desktop.in
 plugins/symlink/symlink.desktop.in
 plugins/template.desktop.in
+plugins/tethered-photography/tethered-photography.desktop.in
 plugins/ufraw/geeqie-ufraw.desktop.in
 plugins/ufraw/geeqie-ufraw-id.desktop.in
 plugins/ufraw/geeqie-ufraw-recursive.desktop.in
@@ -50,12 +51,19 @@ src/history_list.c
 src/image.c
 src/image-load.c
 src/image_load_collection.c
+src/image_load_cr3.c
 src/image_load_dds.c
+src/image_load_djvu.c
 src/image_load_ffmpegthumbnailer.c
 src/image_load_gdk.c
+src/image_load_heif.c
+src/image_load_j2k.c
 src/image_load_jpeg.c
 src/image_load_pdf.c
+src/image_load_psd.c
+src/image_load_svgz.c
 src/image_load_tiff.c
+src/image_load_webp.c
 src/image-overlay.c
 src/img-view.c
 src/jpeg_parser.c
@@ -91,6 +99,7 @@ src/rcfile.c
 src/remote.c
 src/renderer-clutter.c
 src/renderer-tiles.c
+src/search_and_run.c
 src/search.c
 src/secure_save.c
 src/shortcuts.c

diff --git a/po/regen_potfiles.sh b/po/regen_potfiles.sh
index 640442d..d7a6dec 100755 (executable)
--- a/po/regen_potfiles.sh
+++ b/po/regen_potfiles.sh
@@ -3,7 +3,7 @@
 #generate a patch to update POTFILES.in
 #Use like this: ./regen_potfiles.sh | patch -p0
 TMP=POTFILES.in.$$
-((find ../src/ -type f -name '*.c' ; find ../ -type f -name '*.desktop.in') | while read f; do
+((find ../src/ -type f -name '*.c' ; find ../ -type f -name '*.desktop.in' ; find ../ -type f -name '*.appdata.xml.in') | while read f; do
        (echo $f | sed 's#^../##')
 done) | sort > $TMP
 diff -u POTFILES.in $TMP