diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:32:27 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:32:27 -0600 |
| commit | 05e4094411f861bf29bea2e9c39c1b66f8f267f8 (patch) | |
| tree | 0e1037212fb440b1f8beb3288a0a9e8ee8a452ac /debian/rules | |
| parent | acb279125c0fa377c8b1dbbb8634fba60f7f845b (diff) | |
| parent | 2ee937b603b181bb24768eb4d0e2f918a5377fd3 (diff) | |
Merge branch 'master' into branch-1.5
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 8 |
1 files changed, 6 insertions, 2 deletions
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 |