Merge branch 'branch-1.5' into debian

6 files changed, 71 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e47c532..7996e6b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+commit 05e4094411f861bf29bea2e9c39c1b66f8f267f8
+Merge: acb2791 2ee937b
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Sep 10 01:32:27 2014 -0600
+
+    Merge branch 'master' into branch-1.5
+
+commit 2ee937b603b181bb24768eb4d0e2f918a5377fd3
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Sep 10 01:29:56 2014 -0600
+
+    use dh_installmime, which requires telling configure to stay out of the way
+
+commit 22e68da2cb3b0b42708876f1dde52dbfd0ce4bf7
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Sep 10 00:26:10 2014 -0600
+
+    another build dep
+
+commit 615b69b19557a9683eeb0475b30a053a35ca51ac
+Merge: a72b768 0365493
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Sep 10 01:30:37 2014 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 036549343416183f973d00a86d897d4a368c1d6f
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Sep 10 00:03:53 2014 -0700
+
+    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>
+
+commit 1992a1e3046a5414ce8d394e1cd8e5e6f6338d29
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Sep 9 23:43:10 2014 -0700
+
+    .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>
+
+commit acb279125c0fa377c8b1dbbb8634fba60f7f845b
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Sep 10 00:05:07 2014 -0600
+
+    update ChangeLog
+
 commit 5de00e9e39cff2d3b409c2ce99caa994f0a36202
 Merge: b3fba98 a72b768
 Author: Bdale Garbee <bdale@gag.com>
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/configure.ac b/configure.ac
index a6a9d3c5..3062b13b 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) $@
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;