From: Bdale Garbee <bdale@gag.com>
Date: Wed, 25 Jun 2014 03:56:25 +0000 (-0600)
Subject: Merge branch 'branch-1.4' into debian
X-Git-Tag: debian/1.4.1-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=27dbfb4f01f30457fccb22cfe2aba2b3b022a020;hp=-c;p=fw%2Faltos

Merge branch 'branch-1.4' into debian
---

27dbfb4f01f30457fccb22cfe2aba2b3b022a020
diff --combined debian/rules
index 57c7e742,ebcb3b80..c1c9a0f8
--- a/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