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>

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 352fb430478bcd6fd03934bea88772fc6d4b7f02..bc074a958c39653a71ac1305cf2f19b38b9aa780 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -64,7 +64,7 @@ LIBALTOS= \
        altos.dll
 
 desktopdir = $(datadir)/applications
        altos.dll
 
 desktopdir = $(datadir)/applications

-desktop_file = altos.desktop
+desktop_file = altusmetrum-altosui.desktop

 desktop_SCRIPTS = $(desktop_file)
 
 JAR=altosui.jar
 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_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
 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
 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
        chmod +x $@
 
 if FATINSTALL

diff --git a/altosui/altos.desktop.in b/altosui/altos.desktop.in
deleted file mode 100644 (file)
index 6611434..0000000
--- a/altosui/altos.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-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;
-Categories=Education;Electronics;Science;

diff --git a/altosui/altusmetrum-altosui.desktop.in b/altosui/altusmetrum-altosui.desktop.in
new file mode 100644 (file)
index 0000000..716571c
--- /dev/null
+++ b/altosui/altusmetrum-altosui.desktop.in
@@ -0,0 +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=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
+Categories=Education;Electronics;Science;

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 1e09e523cd7031f4a6a590a4b553aa2f5b82e0c6..37d5ca63d0a1ea0cbf7338b1750ae29ed3807dc2 100644 (file)
--- 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
 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)
 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
 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
        chmod +x $@
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2

diff --git a/micropeak/altusmetrum-micropeak.desktop.in b/micropeak/altusmetrum-micropeak.desktop.in
new file mode 100644 (file)
index 0000000..f7d258e
--- /dev/null
+++ b/micropeak/altusmetrum-micropeak.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=MicroPeak
+GenericName=MicroPeak Download and Analysis
+Comment=View and log data from MicroPeak altimeters
+Icon=%icondir%/micropeak.svg
+Exec=%bindir%/micropeak %f
+Terminal=false
+MimeType=application/vnd.altusmetrum.micropeak
+Categories=Education;Electronics;Science;

diff --git a/micropeak/micropeak.desktop.in b/micropeak/micropeak.desktop.in
deleted file mode 100644 (file)
index abdf286..0000000
--- a/micropeak/micropeak.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MicroPeak
-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;
-Categories=Education;Electronics;Science;

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 8868c72385fcfa2079f1a9b8fa6c9dd1e252fdc6..c4f6a58be4a2248d688252f098f041c2da7f7abe 100644 (file)
--- 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
 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)
 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
 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
        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)
 
 
 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
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf

diff --git a/telegps/altusmetrum-telegps.desktop.in b/telegps/altusmetrum-telegps.desktop.in
new file mode 100644 (file)
index 0000000..76c1eb4
--- /dev/null
+++ b/telegps/altusmetrum-telegps.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=TeleGPS
+GenericName=TeleGPS monitor, download and analysis
+Comment=View and log data from TeleGPS tracking devices
+Icon=%icondir%/telegps.svg
+Exec=%bindir%/telegps %f
+Terminal=false
+MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
+Categories=Education;Electronics;Science;

diff --git a/telegps/telegps.desktop.in b/telegps/telegps.desktop.in
deleted file mode 100644 (file)
index 3d249d8..0000000
--- a/telegps/telegps.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=TeleGPS
-GenericName=TeleGPS monitor, download and analysis
-Comment=View and log data from TeleGPS tracking devices
-Icon=%icondir%/telegps.svg
-Exec=%bindir%/telegps %f
-Terminal=false
-MimeType=text/plain;
-Categories=Education;Electronics;Science;