electrum

commit 391a302619ebd09879b9d2e9a1910ba5731a77f4
parent 1f350c31ddc909052bfd6f66ee5d97337aa9ce18
Author: ThomasV <thomasv@electrum.org>
Date:   Tue, 24 Jan 2017 11:32:09 +0100

buildozer.spec: update permissions, version number source

Diffstat:
M
gui/kivy/tools/buildozer.spec
 | 
8
+++++---

1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec
@@ -24,8 +24,8 @@ source.exclude_dirs = bin, build, dist, contrib, gui/android, gui/qt, gui/kivy/t
 source.exclude_patterns = Makefile,setup*
 
 # (str) Application versioning (method 1)
-version.regex = ELECTRUM_VERSION = '(.*)'
-version.filename = %(source.dir)s/lib/version.py
+version.regex = version_apk = '(.*)'
+version.filename = %(source.dir)s/contrib/versions.py
 
 # (str) Application versioning (method 2)
 #version = 1.9.8
@@ -53,7 +53,7 @@ fullscreen = False
 #
 
 # (list) Permissions
-android.permissions = INTERNET, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE, CAMERA, NFC
+android.permissions = INTERNET, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE
 # (int) Android API to use
 #android.api = 14
 
@@ -119,6 +119,8 @@ android.manifest.intent_filters = gui/kivy/tools/bitcoin_intent.xml
 
 android.p4a_whitelist = lib-dynload/_csv.so
 
+# local version that merges branch 866
+android.p4a_dir = /opt/python-for-android
 
 #
 # iOS specific