From 1992a1e3046a5414ce8d394e1cd8e5e6f6338d29 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 9 Sep 2014 23:43:10 -0700
Subject: .desktop: Use %F instead of %f in .desktop files

%F is a list of files, %f is a single file. All of our tools can
handle lists of files, so make the .desktop file reflect that.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosui/altusmetrum-altosui.desktop.in     | 2 +-
 micropeak/altusmetrum-micropeak.desktop.in | 2 +-
 telegps/altusmetrum-telegps.desktop.in     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/altosui/altusmetrum-altosui.desktop.in b/altosui/altusmetrum-altosui.desktop.in
index 10fd9e9d..00f58ec6 100644
--- a/altosui/altusmetrum-altosui.desktop.in
+++ b/altosui/altusmetrum-altosui.desktop.in
@@ -5,7 +5,7 @@ Name=AltOS UI
 GenericName=Altus Metrum Ground Station
 Comment=View and log downlink data from Altus Metrum products
 Icon=%icondir%/altusmetrum-altosui.svg
-Exec=%bindir%/altosui %f
+Exec=%bindir%/altosui %F
 Terminal=false
 MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
 Categories=Education;Electronics;Science;
diff --git a/micropeak/altusmetrum-micropeak.desktop.in b/micropeak/altusmetrum-micropeak.desktop.in
index 782b4704..38b07f0e 100644
--- a/micropeak/altusmetrum-micropeak.desktop.in
+++ b/micropeak/altusmetrum-micropeak.desktop.in
@@ -4,7 +4,7 @@ Name=MicroPeak
 GenericName=MicroPeak Download and Analysis
 Comment=View and log data from MicroPeak altimeters
 Icon=%icondir%/altusmetrum-micropeak.svg
-Exec=%bindir%/micropeak %f
+Exec=%bindir%/micropeak %F
 Terminal=false
 MimeType=application/vnd.altusmetrum.micropeak
 Categories=Education;Electronics;Science;
diff --git a/telegps/altusmetrum-telegps.desktop.in b/telegps/altusmetrum-telegps.desktop.in
index 7a1b3536..f24556c1 100644
--- a/telegps/altusmetrum-telegps.desktop.in
+++ b/telegps/altusmetrum-telegps.desktop.in
@@ -4,7 +4,7 @@ Name=TeleGPS
 GenericName=TeleGPS monitor, download and analysis
 Comment=View and log data from TeleGPS tracking devices
 Icon=%icondir%/altusmetrum-telegps.svg
-Exec=%bindir%/telegps %f
+Exec=%bindir%/telegps %F
 Terminal=false
 MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom
 Categories=Education;Electronics;Science;
-- 
cgit v1.2.3


From 036549343416183f973d00a86d897d4a368c1d6f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 10 Sep 2014 00:03:53 -0700
Subject: configure: Add --disable-install-shared-mime-info option

This inhibits the installation of the shared mime info data file and
updating of the shared mime database. Necessary if you want to use a
distribution-specific shared mime installation hook, like dh_installmime

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 configure.ac     | 9 +++++++++
 icon/Makefile.am | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/configure.ac b/configure.ac
index 311ebbe3..9f2cb0d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,6 +497,14 @@ esac
 	
 AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes])
 
+AC_ARG_ENABLE([install-shared-mime-info],
+	      [AS_HELP_STRING([--disable-install-shared-mime-info],
+	                      [disable installing shared mime info files (default=yes)])],
+	      [INSTALL_SHARED_MIME_INFO=$enableval],
+	      [INSTALL_SHARED_MIME_INFO=yes])
+
+AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xyes])
+
 AC_OUTPUT([
 Makefile
 src/Makedefs
@@ -557,6 +565,7 @@ echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 echo "    STlink support..............: ${HAVE_STLINK}"
 echo "    Local pdclib................: ${HAVE_PDCLIB}"
 echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}"
+echo "    install shared mime info....: ${INSTALL_SHARED_MIME_INFO}"
 echo ""
 echo "  Java"
 echo "    freetts.....................: ${FREETTS}"
diff --git a/icon/Makefile.am b/icon/Makefile.am
index d0cd9853..c08e9236 100644
--- a/icon/Makefile.am
+++ b/icon/Makefile.am
@@ -85,8 +85,10 @@ MIME_ICONS = $(EEPROM_ICON) $(TELEM_ICON) $(MPD_ICON)
 mimeicondir = $(ICON_THEME)/scalable/mimetypes
 mimeicon_DATA = $(MIME_ICONS)
 
+if INSTALL_SHARED_MIME_INFO
 mimedir = $(datadir)/mime/packages
 mime_DATA = org-altusmetrum-mimetypes.xml
+endif
 
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = altusmetrum.xpm
@@ -116,9 +118,11 @@ clean-local:
 	$(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON)
 	$(RM) altusmetrum.xpm
 
+if INSTALL_SHARED_MIME_INFO
 install-data-hook:
 	update-mime-database $(DESTDIR)$(datadir)/mime
 	update-icon-caches $(DESTDIR)$(ICON_THEME)
+endif
 
 $(MPD_ICON): $(MP_ICON)
 	$(LN_S) $(MP_ICON) $@
-- 
cgit v1.2.3