Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/Releasing b/Releasing
index 5827f21dc843e73a11190000d33449e069b30044..d7b337e625fd97aed61e708ed94df9dd0e45abd4 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -2,6 +2,10 @@ These are Bdale's notes on how to do a release.
 
        git checkout master
 
+       - make sure the Google Maps API key is in the build chroot
+               mkdir -p /var/cache/pbuilder/base.cow/opt/google
+               cp ~/altusmetrumllc/google-maps-api-key \
+                       /var/cache/pbuilder/base.cow/opt/google/maps-api-key
        - make sure there is a doc/release-notes-<version>.xsl
        - make sure that doc/altusmetrum.xsl has the right copyright year,
          and add release to the revision history at the front (release notes

diff --git a/debian/rules b/debian/rules
index 2b79846498e90c7cec7d528946814fd801c3786d..ebcb3b803dfd4e5c90b16b857cf5a23b8c739149 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,8 @@ prebuild:
 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 --with-google-key=/opt/google/maps-api-key
        touch configure-stamp
 
 build: build-arch build-indep