Bump release number to 1.9.5p8. Disable the JSON_FILES feature for th…

…is release.

CMakeLists.txt

@@ -27,7 +27,7 @@ project (Eternal-Lands)
 # standard options that also set source files to build
 set(CUSTOM_UPDATE 1)			# allows autoupdating of custom look information
 set(FSAA 1)						# Adds support for full screen anti-aliasing using OpenGL multisampling.
-set(JSON_FILES 1)				# switch existing binary user config files to JSON format
+set(JSON_FILES 0)				# switch existing binary user config files to JSON format
 
 # standard options
 add_definitions(

debian/changelog

@@ -1,6 +1,6 @@
-eternallands (1.9.5.7-0ubuntu1) xenial; urgency=low
+eternallands (1.9.5.8-0ubuntu1) xenial; urgency=low
 
-  * 1.9.5 p7 release see:
-  * https://github.com/raduprv/Eternal-Lands/releases/tag/1.9.5.7
+  * 1.9.5 p8 release see:
+  * https://github.com/raduprv/Eternal-Lands/releases/tag/1.9.5.8
 
- -- Paul Broadhead <pjbroad@twinmoons.org.uk>  Mon, 30 Mar 2020 21:56:45 +0100
+ -- Paul Broadhead <pjbroad@twinmoons.org.uk>  Wed, 29 Apr 2020 20:45:20 +0100

elc_private.h

@@ -9,7 +9,7 @@
 #define VER_MAJOR	1
 #define VER_MINOR	9
 #define VER_RELEASE	5
-#define VER_BUILD	7
+#define VER_BUILD	8
 #define COMPANY_NAME	""
 #define FILE_VERSION	"1.9.5"
 #define FILE_DESCRIPTION	"Eternal-Lands Client"

make.defaults

@@ -24,8 +24,8 @@ FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the pr
 # new for 1.9.4 release
 FEATURES += NEW_EYES			# Support for different eye colors, needs new data files
 
-# Development options targetting a most 1.9.6
-FEATURES += JSON_FILES			# switch existing binary user config files to JSON format
+# Development options targetting at most 1.9.6
+#FEATURES += JSON_FILES			# switch existing binary user config files to JSON format
 
 ### Testing options (these options are possible for the next release and should be tested) ###
 #FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: eternallands
 # Set to x.y.zpn / x.y.zpn-dev for stable / dev build
-version: '1.9.5p8-dev'
+version: '1.9.5p8'
 summary: Eternal Lands is a free to play, graphical MMORPG
 description: |
   Eternal Lands is a free to play, graphical MMORPG (massively-multi-player
@@ -15,11 +15,11 @@ type: app
 icon: pkgfiles/snap-package/eternallands.png
 
 parts:
-  nlohmann:
-    source: https://github.com/nlohmann/json/archive/v3.7.3.zip
-    source-checksum: sha256/e109cd4a9d1d463a62f0a81d7c6719ecd780a52fb80a22b901ed5b6fe43fb45b
-    source-subdir: json-3.7.3
-    plugin: cmake
+#  nlohmann:
+#    source: https://github.com/nlohmann/json/archive/v3.7.3.zip
+#    source-checksum: sha256/e109cd4a9d1d463a62f0a81d7c6719ecd780a52fb80a22b901ed5b6fe43fb45b
+#    source-subdir: json-3.7.3
+#    plugin: cmake
 
   desktop-glib-only:
     source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
@@ -34,11 +34,11 @@ parts:
     source: https://github.com/raduprv/Eternal-Lands
     source-type: git
     # Include for stable release, comment out for dev build, comment out for latest commit dev release
-    # source-tag: 1.9.5.7
+    source-tag: 1.9.5.8
     build-packages: [build-essential, libcal3d12-dev, libsdl2-image-dev, libsdl2-net-dev, libxml2-dev, libopenal-dev, libvorbis-dev, libpng-dev]
     plugin: cmake
     # Add -DVERSION_PREFIX=x.y.z for dev build, remove for release
-    configflags:  ["-DCMAKE_BUILD_TYPE=release", "-DEXEC=el.linux.bin", "-DVERSION_PREFIX=1.9.5"]
+    configflags:  ["-DCMAKE_BUILD_TYPE=release", "-DEXEC=el.linux.bin"]
     stage-packages:
       - libglib2.0-0
       - libsdl2-net-2.0-0
@@ -64,7 +64,7 @@ parts:
       - mesa-vulkan-drivers
     after:
       - desktop-glib-only
-      - nlohmann
+#     - nlohmann
 
   data:
     source: https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.7/el_195_p7_data_files.zip