From 21d176f161b90f18f236ef887cef9676d712eee3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 21 Apr 2016 21:12:40 -0400
Subject: Update java library version numbers

Prepare for 1.6.3 release.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altoslib/AltosVersion.java.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'altoslib/AltosVersion.java.in')

diff --git a/altoslib/AltosVersion.java.in b/altoslib/AltosVersion.java.in
index 8c53ef0d..050b9480 100644
--- a/altoslib/AltosVersion.java.in
+++ b/altoslib/AltosVersion.java.in
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_9;
+package org.altusmetrum.altoslib_10;
 
 public class AltosVersion {
 	public final static String version = "@VERSION@";
-- 
cgit v1.2.3


From 02f47fa98536eb0ecd58cd8f063600ced60e0a8a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 27 Apr 2016 01:39:01 -0400
Subject: Fix key in AndroidManifest.xml.in

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/AndroidManifest.xml.in | 2 +-
 altoslib/AltosVersion.java.in     | 2 +-
 configure.ac                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'altoslib/AltosVersion.java.in')

diff --git a/altosdroid/AndroidManifest.xml.in b/altosdroid/AndroidManifest.xml.in
index 488a6766..3409c9fe 100644
--- a/altosdroid/AndroidManifest.xml.in
+++ b/altosdroid/AndroidManifest.xml.in
@@ -100,7 +100,7 @@
         <service android:name=".TelemetryService" />
 
         <meta-data android:name="com.google.android.maps.v2.API_KEY"
-                   android:value="AIzaSyDSr6u4i9TJmVGhgGk4g0wUUhTy9FGyn0s"/>
+                   android:value="@GOOGLEKEY@"/>
         <meta-data android:name="com.google.android.gms.version"
                    android:value="@integer/google_play_services_version" />
     </application>
diff --git a/altoslib/AltosVersion.java.in b/altoslib/AltosVersion.java.in
index 050b9480..9ac94dcd 100644
--- a/altoslib/AltosVersion.java.in
+++ b/altoslib/AltosVersion.java.in
@@ -20,7 +20,7 @@ package org.altusmetrum.altoslib_10;
 public class AltosVersion {
 	public final static String version = "@VERSION@";
 
-	public final static String google_maps_api_key = @GOOGLEKEY@;
+	public final static String google_maps_api_key = "@GOOGLEKEY@";
 
 	public static boolean has_google_maps_api_key() {
 		return google_maps_api_key != null && google_maps_api_key.length() > 1;
diff --git a/configure.ac b/configure.ac
index 80590133..ee3d4225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,7 +174,7 @@ AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH],
 	    [GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key])
 
 if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
-	GOOGLEKEY='"'`cat "$GOOGLEKEYFILE"`'"'
+	GOOGLEKEY=`cat "$GOOGLEKEYFILE"`
 	HAVE_GOOGLE_KEY="yes"
 else
 	GOOGLEKEY='null'
-- 
cgit v1.2.3