Prepared for version 2.6.0 release

Author: sago007

CMakeLists.txt

@@ -3,7 +3,7 @@ project (blockattack)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${blockattack_SOURCE_DIR}/source/misc/cmake")
 set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)
 
-SET(CPACK_PACKAGE_VERSION "2.6.0-SNAPSHOT")
+SET(CPACK_PACKAGE_VERSION "2.6.0")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")

ReleaseNotes-2.6.0.txt

@@ -0,0 +1,16 @@
+This is Block Attack - Rise of the Blocks - version 2.6.0
+
+The main focus of this release is improved controller support.
+
+Changes since 2.5.0:
+
+Modified the controller keybind. "B" is now Cancel instead of "Y"
+There is a virtual keyboard on the enter name screen allowing using a mouse or a gamepad to type.
+Added patch by bmwiedemann for sorting in the data file
+Update embedded Cerial from 1.2.2 to 1.3.0
+Update library versions for the compiled Linux version:
+ * SDL2: 2.0.9 to 2.0.12
+ * SDL2_image: 2.0.4 to 2.0.5
+ * SDL2_ttf: 2.0.14 to 2.0.15
+ * physfs: 2.0.3 to 3.0.2 
+

man/blockattack.man

@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BLOCKATTACK "6" "June 2019" "blockattack 2.6.0-SNAPSHOT" "Games"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
+.TH BLOCKATTACK "6" "September 2020" "blockattack 2.6.0" "Games"
 .SH NAME
 blockattack \- a puzzle game inspired by Tetris Attack
 .SH SYNOPSIS
 .B blockattack
 [\fI\,OPTION\/\fR]...
 .SH DESCRIPTION
-Block Attack \- Rise of the blocks 2.6.0\-SNAPSHOT
+Block Attack \- Rise of the blocks 2.6.0
 .PP
 Block Attack \- Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.
 .PP

source/code/version.h

@@ -30,5 +30,5 @@ Source information and contacts persons can be found at
 #define GAMENAME "blockattack"
 
 #ifndef VERSION_NUMBER
-#define VERSION_NUMBER "2.6.0-SNAPSHOT"
+#define VERSION_NUMBER "2.6.0"
 #endif

source/misc/docker/Dockerfile.Fedora25build

@@ -15,7 +15,7 @@ zip \
 
 COPY . /staging/blockattack-game
 
-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.6.0
 
 RUN cd /staging/blockattack-game && \
 ./packdata.sh && \

source/misc/docker/Dockerfile.Fedora29build

@@ -15,7 +15,7 @@ zip \
 
 COPY . /staging/blockattack-game
 
-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.6.0
 
 RUN cd /staging/blockattack-game && \
 ./packdata.sh && \

source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone

@@ -16,7 +16,7 @@ RUN /compile_requirements.sh
 
 COPY . /staging/blockattack-game
 
-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.6.0
 
 RUN cd /staging/blockattack-game && \
 ./packdata.sh && \

source/misc/docker/Dockerfile.Ubuntu14.04build

@@ -6,7 +6,7 @@ RUN mkdir -p /staging/blockattack-game
 
 COPY . /staging/blockattack-game
 
-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.6.0
 
 RUN cd /staging/blockattack-game && \
 ./packdata.sh && \

source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone

@@ -7,7 +7,7 @@ RUN /compile_requirements.sh
 
 COPY . /staging/blockattack-game
 
-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.6.0
 
 RUN cd /staging/blockattack-game && \
 ./packdata.sh && \

source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32

@@ -7,7 +7,7 @@ RUN /compile_requirements.sh
 
 COPY . /staging/blockattack-game
 
-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.6.0
 
 RUN cd /staging/blockattack-game && \
 ./packdata.sh && \