Desktop fixes

- Add svg icon installed into a standard icons dir instead of the non-standard dimensions png in pixmaps
- Rename the desktop icon to just "gpredict" to match desktop file name
- Add AppStream metainfo file
- Fix Makefile formatting

Makefile.am

@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src doc pixmaps data po
+SUBDIRS = src doc icons pixmaps data po
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:

configure.ac

@@ -126,12 +126,14 @@ doc/man/Makefile
 src/Makefile
 src/sgpsdp/Makefile
 src/sgpsdp/TR/Makefile
+icons/Makefile
 pixmaps/Makefile
 pixmaps/maps/Makefile
 pixmaps/logos/Makefile
 pixmaps/icons/Makefile
 data/Makefile
 data/desktop/Makefile
+data/metainfo/Makefile
 data/satdata/Makefile
 po/Makefile.in
 ])

data/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = satdata desktop
+SUBDIRS = satdata desktop metainfo
 
 gpredict_datdir = $(pkgdatadir)/data
 

data/desktop/gpredict.desktop.in

@@ -2,7 +2,7 @@
 Name=Gpredict
 Comment=Satellite tracker
 Exec=gpredict
-Icon=gpredict-icon
+Icon=gpredict
 Terminal=false
 Type=Application
 Categories=HamRadio;Science;Astronomy;Education;Network;

data/metainfo/Makefile.am

@@ -0,0 +1,5 @@
+gpredict_metainfodir = $(datadir)/metainfo
+
+gpredict_metainfo_DATA = dk.oz9aec.Gpredict.metainfo.xml
+
+EXTRA_DIST = $(gpredict_metainfo_DATA)

data/metainfo/dk.oz9aec.Gpredict.metainfo.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>dk.oz9aec.Gpredict</id>
+  <name>Gpredict</name>
+  <developer_name>Alexandru Csete</developer_name>
+  <summary>Real-time satellite tracking and orbit prediction program</summary>
+  <description>
+    <p>Gpredict is a real time satellite tracking and orbit prediction program written using the Gtk+ widgets.</p>
+    <p>Gpredict is targeted mainly towards ham radio operators but others interested in satellite tracking may find it useful as well.</p>
+  </description>
+  <categories>
+    <category>Astronomy</category>
+    <category>Education</category>
+    <category>HamRadio</category>
+    <category>Network</category>
+    <category>Science</category>
+  </categories>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <provides>
+    <id>gpredict.desktop</id>
+  </provides>
+  <url type="homepage">https://oz9aec.dk/gpredict/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://live.staticflickr.com/8089/28902144392_8cd36d57fe_b.jpg</image>
+    </screenshot>
+  </screenshots>
+  <launchable type="desktop-id">gpredict.desktop</launchable>
+  <content_rating type="oars-1.1" />
+</component>

data/satdata/Makefile.am

@@ -1,7 +1,5 @@
-
 gpredict_satdir = $(pkgdatadir)/data/satdata
 
 gpredict_sat_DATA = satellites.dat *.cat
 
 EXTRA_DIST = $(gpredict_sat_DATA)
-

icons/.gitignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

icons/Makefile.am

@@ -0,0 +1,4 @@
+gpredict_iconsdir = $(datadir)/icons/hicolor/scalable/apps
+gpredict_icons_DATA = gpredict.svg
+
+EXTRA_DIST = $(gpredict_icons_DATA)

pixmaps/icons/Makefile.am

@@ -1,9 +1,6 @@
-gpredict_iconsdir = $(datadir)/pixmaps/gpredict/icons
+gpredict_pixmaps_iconsdir = $(datadir)/pixmaps/gpredict/icons
 
-gpredict_icons2dir = $(datadir)/pixmaps/
-gpredict_icons2_DATA = gpredict-icon.png
-
-gpredict_icons_DATA = \
+gpredict_pixmaps_icons_DATA = \
 	gpredict-antenna.png \
 	gpredict-antenna-small.png \
 	gpredict-azel-small.png \
@@ -39,5 +36,4 @@ gpredict_icons_DATA = \
 	gpredict-shuttle.png \
 	gpredict-shuttle-small.png
 
-EXTRA_DIST = $(gpredict_icons_DATA) $(gpredict_icons2_DATA)
-
+EXTRA_DIST = $(gpredict_pixmaps_icons_DATA)

pixmaps/logos/Makefile.am

@@ -1,6 +1,6 @@
-gpredict_logosdir = $(datadir)/pixmaps/gpredict/logos
+gpredict_pixmaps_logosdir = $(datadir)/pixmaps/gpredict/logos
 
-gpredict_logos_DATA = \
+gpredict_pixmaps_logos_DATA = \
     gpredict_horizontal_color.png \
     gpredict_horizontal_color.svg \
     gpredict_horizontal_white.png \
@@ -14,4 +14,4 @@ gpredict_logos_DATA = \
     gpredict_vertical_white.png \
     gpredict_vertical_white.svg
 
-EXTRA_DIST = $(gpredict_logos_DATA)
+EXTRA_DIST = $(gpredict_pixmaps_logos_DATA)

pixmaps/maps/Makefile.am

@@ -1,7 +1,6 @@
+gpredict_pixmaps_mapsdir = $(datadir)/pixmaps/gpredict/maps
 
-gpredict_mapsdir = $(datadir)/pixmaps/gpredict/maps
-
-gpredict_maps_DATA = \
+gpredict_pixmaps_maps_DATA = \
     earth_800.png \
     nasa-bmng-01_1024.jpg \
     nasa-bmng-03_1024.jpg \
@@ -18,5 +17,4 @@ gpredict_maps_DATA = \
     nasa-topo_1600.jpg \
     nasa-topo_2048.jpg
 
-EXTRA_DIST = $(gpredict_maps_DATA)
-
+EXTRA_DIST = $(gpredict_pixmaps_maps_DATA)