diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index 881778725..e4f27a763 100644 --- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Debian" AppFullName=com.cuntubuntu # Application version code (integer) -AppVersionCode=150924 +AppVersionCode=151020 # Application user-visible version name (string) -AppVersionName="15.09.24" +AppVersionName="15.10.20" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -18,7 +18,7 @@ AppVersionName="15.09.24" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.150626|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-debian-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!Update 1|:update1.tar.gz:update1-.tgz" +AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.150626|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-debian-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!Update 1|:update1.tar.gz:update1-.tgz^!!Update 2|:update2.tar.gz:update2.tgz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n diff --git a/project/jni/application/xserver-debian/AndroidData/update2.tgz b/project/jni/application/xserver-debian/AndroidData/update2.tgz new file mode 100644 index 000000000..cc1347f4f Binary files /dev/null and b/project/jni/application/xserver-debian/AndroidData/update2.tgz differ diff --git a/project/jni/application/xserver-debian/pulseaudio b/project/jni/application/xserver-debian/pulseaudio new file mode 120000 index 000000000..45f192f1d --- /dev/null +++ b/project/jni/application/xserver-debian/pulseaudio @@ -0,0 +1 @@ +../xserver/pulseaudio \ No newline at end of file diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c index a687b783d..a9c5c1ee0 100644 --- a/project/jni/application/xserver/main.c +++ b/project/jni/application/xserver/main.c @@ -105,7 +105,7 @@ int main( int argc, char* argv[] ) "%s/img/usr/share/fonts/X11/Type1," "%s/img/usr/share/fonts/X11/100dpi," "%s/img/usr/share/fonts/X11/75dpi," - "%s/img/usr/share/fonts/X11/cyrillic", + "%s/img/usr/share/fonts/X11/cyrillic" "%s/usr/share/fonts", getenv("SECURE_STORAGE_DIR"), getenv("SECURE_STORAGE_DIR"),