From 37856672c57f2fd91184c2391a201bbbdc48545e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 19 Jun 2014 10:25:07 -0700
Subject: 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>
---
 micropeak/Makefile.am                      |  4 ++--
 micropeak/altusmetrum-micropeak.desktop.in | 10 ++++++++++
 micropeak/micropeak.desktop.in             | 10 ----------
 3 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 micropeak/altusmetrum-micropeak.desktop.in
 delete mode 100644 micropeak/micropeak.desktop.in

(limited to 'micropeak')

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/altusmetrum-micropeak.desktop.in b/micropeak/altusmetrum-micropeak.desktop.in
new file mode 100644
index 00000000..f7d258ec
--- /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
index abdf286f..00000000
--- 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;
-- 
cgit v1.2.3