Merge branch 'master' into 'master'

Updating Tuxpaint to 0.9.23 beta 7.

Note that the sources changed from my personal repo at github to the tux4kids repo.
Also, the zip file in assets is generated at prebuild time, the script that generates it needs make, gettext and zip.
Thanks
Pere

See merge request !1759

metadata/org.tuxpaint.txt

@@ -1,7 +1,7 @@
 Categories:Graphics,Science & Education
 License:GPLv2+
 Web Site:http://tuxpaint.org
-Source Code:https://github.com/perepujal/Tuxpaint-Android
+Source Code:https://github.com/tux4kids/Tuxpaint-Android
 Issue Tracker:https://sourceforge.net/p/tuxpaint/bugs/?source=navbar
 Donate:http://www.newbreedsoftware.com/donate/
 
@@ -16,8 +16,9 @@ Status:Beta.
 .
 
 Repo Type:git
-Repo:https://github.com/perepujal/Tuxpaint-Android.git
+Repo:https://github.com/tux4kids/Tuxpaint-Android.git
 
+# Repo:file:///home/pere/tuxpaint/cvsautenticat/tux4kids/Tuxpaint-Android
 Build:0.9.23-beta,1
     commit=966b358a6379e272466e7dc821f2bc469e301de5
     extlibs=android/android-support-v4.jar
@@ -48,7 +49,15 @@ Build:0.9.23-beta_6,6
     scandelete=jni/
     buildjni=yes
 
+Build:0.9.23-beta_7,7
+    commit=87c3b479e2b1690d8f76711dbb415cc3b659c23e
+    extlibs=android/android-support-v4.jar
+    prebuild=cd jni/tuxpaint/ && \
+        ./mkzip_assets.sh
+    scandelete=jni/
+    buildjni=yes
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:0.9.23-beta_6
-Current Version Code:6
+Current Version:0.9.23-beta_7
+Current Version Code:7