linux: .desktop files must begin with organization name

The spec requires that .desktop files start with the organization
name, so I've renamed all of them to altusmetrum-<application>.desktop

Signed-off-by: Keith Packard <keithp@keithp.com>

6 files changed, 14 insertions, 13 deletions

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 352fb430..bc074a95 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -64,7 +64,7 @@ LIBALTOS= \
 	altos.dll
 
 desktopdir = $(datadir)/applications
-desktop_file = altos.desktop
+desktop_file = altusmetrum-altosui.desktop
 desktop_SCRIPTS = $(desktop_file)
 
 JAR=altosui.jar
@@ -141,7 +141,7 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
 
 LINUX_LIBS=libaltos32.so libaltos64.so
 
-LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) altos.desktop.in ../icon/altusmetrum.svg
+LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) $(desktop_file).in ../icon/altusmetrum.svg
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
@@ -161,7 +161,7 @@ clean-local:
 EXTRA_DIST = $(desktop_file).in
 
 $(desktop_file): $(desktop_file).in
-	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/altos.desktop.in > $@
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
 	chmod +x $@
 
 if FATINSTALL
diff --git a/altosui/altos.desktop.in b/altosui/altusmetrum-altosui.desktop.in
index 66114348..716571ce 100644
--- a/altosui/altos.desktop.in
+++ b/altosui/altusmetrum-altosui.desktop.in
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Type=Application
+Version=1.0
 Name=AltOS UI
 GenericName=Altus Metrum Ground Station
 Comment=View and log downlink data from Altus Metrum products
 Icon=%icondir%/altusmetrum.svg
 Exec=%bindir%/altosui %f
 Terminal=false
-MimeType=text/plain;
+MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
 Categories=Education;Electronics;Science;
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 1e09e523..37d5ca63 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -75,7 +75,7 @@ WINDOWS_ICON=$(ICONDIR)/micro-peak.ico $(ICONDIR)/micro-peak.exe
 MACOSX_ICON=$(ICONDIR)/MicroPeak.icns
 
 desktopdir = $(datadir)/applications
-desktop_file = micropeak.desktop
+desktop_file = altusmetrum-micropeak.desktop
 desktop_SCRIPTS = $(desktop_file)
 
 all-local: micropeak-test micropeak-jdb $(JAR)
@@ -92,7 +92,7 @@ clean-local:
 EXTRA_DIST = $(desktop_file).in
 
 $(desktop_file): $(desktop_file).in
-	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/micropeak.desktop.in > $@
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
 	chmod +x $@
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
diff --git a/micropeak/micropeak.desktop.in b/micropeak/altusmetrum-micropeak.desktop.in
index abdf286f..f7d258ec 100644
--- a/micropeak/micropeak.desktop.in
+++ b/micropeak/altusmetrum-micropeak.desktop.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
 Name=MicroPeak
-GenericName=MicroPeak download and analysis
+GenericName=MicroPeak Download and Analysis
 Comment=View and log data from MicroPeak altimeters
 Icon=%icondir%/micropeak.svg
 Exec=%bindir%/micropeak %f
 Terminal=false
-MimeType=text/plain;
+MimeType=application/vnd.altusmetrum.micropeak
 Categories=Education;Electronics;Science;
diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 8868c723..c4f6a58b 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -89,7 +89,7 @@ FIRMWARE_TG=$(FIRMWARE_TG_1_0)
 FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
 desktopdir = $(datadir)/applications
-desktop_file = telegps.desktop
+desktop_file = altusmetrum-telegps.desktop
 desktop_SCRIPTS = $(desktop_file)
 
 all-local: telegps-test telegps-jdb $(JAR)
@@ -106,7 +106,7 @@ clean-local:
 EXTRA_DIST = $(desktop_file).in
 
 $(desktop_file): $(desktop_file).in
-	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/telegps.desktop.in > $@
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/$(desktop_file).in > $@
 	chmod +x $@
 
 LINUX_DIST=TeleGPS-Linux-$(VERSION).tar.bz2
@@ -120,8 +120,8 @@ DOC=$(TELEGPS_DOC)
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) telegps.desktop.in ../icon/telegps.svg
-LINUX_EXTRA=telegps-fat telegps.desktop.in
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in ../icon/telegps.svg
+LINUX_EXTRA=telegps-fat $(desktop_file).in
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
diff --git a/telegps/telegps.desktop.in b/telegps/altusmetrum-telegps.desktop.in
index 3d249d8a..76c1eb42 100644
--- a/telegps/telegps.desktop.in
+++ b/telegps/altusmetrum-telegps.desktop.in
@@ -6,5 +6,5 @@ Comment=View and log data from TeleGPS tracking devices
 Icon=%icondir%/telegps.svg
 Exec=%bindir%/telegps %f
 Terminal=false
-MimeType=text/plain;
+MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
 Categories=Education;Electronics;Science;