From 22e68da2cb3b0b42708876f1dde52dbfd0ce4bf7 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 10 Sep 2014 00:26:10 -0600 Subject: another build dep --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') 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 Uploaders: Keith Packard -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 -- cgit v1.2.3 From 2ee937b603b181bb24768eb4d0e2f918a5377fd3 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 10 Sep 2014 01:29:56 -0600 Subject: use dh_installmime, which requires telling configure to stay out of the way --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') 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 -- cgit v1.2.3