diff options
| -rw-r--r-- | altosui/altusmetrum-altosui.desktop.in | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 | ||||
| -rw-r--r-- | icon/Makefile.am | 4 | ||||
| -rw-r--r-- | micropeak/altusmetrum-micropeak.desktop.in | 2 | ||||
| -rw-r--r-- | telegps/altusmetrum-telegps.desktop.in | 2 |
7 files changed, 23 insertions, 6 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/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/debian/control b/debian/control index 7ab12d42..f3a37ed0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee <bdale@gag.com> Uploaders: Keith Packard <keithp@keithp.com> -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick, netpbm, shared-mime-info +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick, netpbm, shared-mime-info, libgtk-3-bin Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos diff --git a/debian/rules b/debian/rules index ebcb3b80..2aa967e9 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,9 @@ configure: configure-stamp configure-stamp: dh_testdir PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh \ - --prefix=/usr --with-google-key=/opt/google/maps-api-key + --prefix=/usr \ + --disable-install-shared-mime-info \ + --with-google-key=/opt/google/maps-api-key touch configure-stamp build: build-arch build-indep @@ -36,6 +38,7 @@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp + rm -f debian/altos.sharedmimeinfo [ ! -f Makefile ] || $(MAKE) distclean dh_clean @@ -66,7 +69,8 @@ binary-arch: install # dh_installlogrotate # dh_installemacsen # dh_installpam -# dh_installmime + cp icon/org-altusmetrum-mimetypes.xml debian/altos.sharedmimeinfo + dh_installmime # dh_python # dh_installinit # dh_installcron 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; |