From: Bdale Garbee <bdale@gag.com>
Date: Wed, 25 Jun 2014 03:17:53 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.4.9.1~32
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=bd440afc2a6e37b74fffcf1b977e149485095316;hp=a0ccab8e4235934538a03f8be3b37aa1bbd6b144

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

diff --git a/Releasing b/Releasing
index 5827f21d..d7b337e6 100644
--- 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 2b798464..ebcb3b80 100755
--- 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