Merge branch 'branch-1.4' into debian

diff --combined debian/rules
index 57c7e7426e9af07f360d9109e26bfefb0f09beac,ebcb3b803dfd4e5c90b16b857cf5a23b8c739149..c1c9a0f8549297d49fd6b332b7f2492d87a9819c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -3,15 -3,23 +3,16 @@@
  
  export DH_VERBOSE=1
  PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 -DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; fi | tr - +)
  
  # this target invoked by git-buildpackage using a clean hook, see .gbp.conf
  prebuild:
 -      echo $(DEB_VERSION)
 -      git-dch --release --new-version=$(DEB_VERSION) --multimaint-merge
 -      git log > ChangeLog
 -      git commit -n ChangeLog debian/changelog \
 -              -m "update changelogs for Debian build"
 -#     git tag debian/$(DEB_VERSION)
 -#     git push --tags origin master
 +      echo "not frobbing changelog for official builds"
  
  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