projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index 57c7e7426e9af07f360d9109e26bfefb0f09beac..9ff89cc82a14fefedddf9072698f2ae6cff82d0b 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-11,7
+11,10
@@
prebuild:
configure: configure-stamp
configure-stamp:
dh_testdir
configure: configure-stamp
configure-stamp:
dh_testdir
- PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh --prefix=/usr
+ PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh \
+ --prefix=/usr \
+ --disable-install-shared-mime-info \
+ --with-google-key=/opt/google/maps-api-key
touch configure-stamp
build: build-arch build-indep
touch configure-stamp
build: build-arch build-indep
@@
-28,6
+31,7
@@
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ rm -f debian/altos.sharedmimeinfo
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
@@
-58,7
+62,8
@@
binary-arch: install
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# 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
# dh_python
# dh_installinit
# dh_installcron