Update changelog and version.

titouanc · May 25, 2020 · cea0423 · cea0423
1 parent 6bd435d
commit cea0423
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(mosquitto)
 cmake_minimum_required(VERSION 2.8)
 # Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 1.6.9)
+set (VERSION 1.6.10)
 
 add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
 

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+1.6.10 - 2020-05-25
+===================
+
 Broker:
 - Report invalid bridge prefix+pattern combinations at config parsing time
   rather than letting the bridge fail later. Issue #1635.

diff --git a/config.mk b/config.mk
@@ -109,7 +109,7 @@ WITH_COVERAGE:=no
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto64.nsi
-VERSION=1.6.9
+VERSION=1.6.10
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.
 SOVERSION=1

diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "Eclipse Mosquitto"
-!define VERSION 1.6.9
+!define VERSION 1.6.10
 OutFile "mosquitto-${VERSION}-install-windows-x86.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"

diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "Eclipse Mosquitto"
-!define VERSION 1.6.9
+!define VERSION 1.6.10
 OutFile "mosquitto-${VERSION}-install-windows-x64.exe"
 
 !include "x64.nsh"

diff --git a/lib/mosquitto.h b/lib/mosquitto.h
@@ -48,7 +48,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 1
 #define LIBMOSQUITTO_MINOR 6
-#define LIBMOSQUITTO_REVISION 9
+#define LIBMOSQUITTO_REVISION 10
 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */
 #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION)
 

diff --git a/set-version.sh b/set-version.sh
@@ -2,7 +2,7 @@
 
 MAJOR=1
 MINOR=6
-REVISION=9
+REVISION=10
 
 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
 

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mosquitto
-version: 1.6.9
+version: 1.6.10
 summary: Eclipse Mosquitto MQTT broker
 description: This is a message broker that supports version 3.1 and 3.1.1 of the MQTT
     protocol.
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     MAJOR=1
     MINOR=6
-    REVISION=9
+    REVISION=10
     sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
@@ Expand Down @@