From 19b57021683144590f46dc4b6b59076740e6b360 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Mon, 16 Sep 2019 22:59:45 +0200 Subject: [PATCH] Bump version to 1.4.0 1.3.0 has been released. master now represents the current state of development towards the next feature release 1.4.0. Bugfixes for 1.3 will happen in the 1.3.x branch. Compared to earlier version bumps we bump a lot more files because of we produce more artifacts; overlay process, dll and exe split, etc. This should have happened right after the 1.3.x branch was split off. --- g15helper/g15helper.plist | 2 +- g15helper/g15helper.rc | 8 ++++---- installer/Settings.wxi | 2 +- macx/common.pri | 2 +- macx/osax/osax.plist | 2 +- overlay/mumble_ol.rc | 8 ++++---- overlay/overlay-shared.pro | 2 +- overlay/overlay_exe/overlay_exe.rc | 8 ++++---- overlay_gl/overlay_gl.pro | 2 +- overlay_winx64/mumble_ol.rc | 8 ++++---- overlay_winx64/overlay_exe_winx64/overlay_exe.rc | 8 ++++---- src/mumble.pri | 2 +- src/mumble/mumble.plist | 2 +- src/mumble/mumble.rc | 8 ++++---- src/mumble/mumble_dll.rc | 8 ++++---- src/murmur/murmur.plist | 2 +- src/murmur/murmur.rc | 8 ++++---- themes/Mumble | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist index 74937fbe4b6..d29bb58562a 100644 --- a/g15helper/g15helper.plist +++ b/g15helper/g15helper.plist @@ -13,7 +13,7 @@ CFBundleSignature G15H CFBundleVersion - 1.3.0 + 1.4.0 NSHumanReadableCopyright Copyright (c) 2005-2019 The Mumble Developers diff --git a/g15helper/g15helper.rc b/g15helper/g15helper.rc index 3b12857b24c..ab966b75883 100644 --- a/g15helper/g15helper.rc +++ b/g15helper/g15helper.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "../icons/g15helper.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -34,8 +34,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble G15 LCD Helper" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble-g15-helper.exe" VALUE "ProductName", "Mumble G15 LCD Helper" diff --git a/installer/Settings.wxi b/installer/Settings.wxi index 2f7e526c0ec..85158c15a99 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -2,7 +2,7 @@ - + diff --git a/macx/common.pri b/macx/common.pri index 05f68ef9a9f..5f26e5de8ce 100644 --- a/macx/common.pri +++ b/macx/common.pri @@ -5,7 +5,7 @@ # Common OSX overlay settings. -VERSION = 1.3.0 +VERSION = 1.4.0 DEFINES *= VERSION=\\\"$$VERSION\\\" diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist index d141e6b05b2..99f81ef20a6 100644 --- a/macx/osax/osax.plist +++ b/macx/osax/osax.plist @@ -13,7 +13,7 @@ CFBundlePackageType osax CFbundleVersion - 1.3.0 + 1.4.0 CFBundleSignature MUOL CSResourcesFileMapped diff --git a/overlay/mumble_ol.rc b/overlay/mumble_ol.rc index 8cd8e641c32..cf71f0472fe 100644 --- a/overlay/mumble_ol.rc +++ b/overlay/mumble_ol.rc @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble_ol.dll" VALUE "ProductName", "Mumble" diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro index 084fa97f3ac..3f5f30895de 100644 --- a/overlay/overlay-shared.pro +++ b/overlay/overlay-shared.pro @@ -5,7 +5,7 @@ include (../qmake/compiler.pri) -VERSION = 1.3.0 +VERSION = 1.4.0 TARGET_EXT = .dll TEMPLATE = lib CONFIG -= qt diff --git a/overlay/overlay_exe/overlay_exe.rc b/overlay/overlay_exe/overlay_exe.rc index d62e1b7faa0..42a83d4c961 100644 --- a/overlay/overlay_exe/overlay_exe.rc +++ b/overlay/overlay_exe/overlay_exe.rc @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble_ol_helper.exe" VALUE "ProductName", "Mumble" diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro index 0cf0800a97e..e678802eddc 100644 --- a/overlay_gl/overlay_gl.pro +++ b/overlay_gl/overlay_gl.pro @@ -10,7 +10,7 @@ include(../qmake/compiler.pri) TEMPLATE = lib CONFIG -= qt gui CONFIG *= debug_and_release -VERSION = 1.3.0 +VERSION = 1.4.0 SOURCES = overlay.c CONFIG(static) { diff --git a/overlay_winx64/mumble_ol.rc b/overlay_winx64/mumble_ol.rc index 55eb4927ec7..ea3d5f7d151 100644 --- a/overlay_winx64/mumble_ol.rc +++ b/overlay_winx64/mumble_ol.rc @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble_ol_x64.dll" VALUE "ProductName", "Mumble" diff --git a/overlay_winx64/overlay_exe_winx64/overlay_exe.rc b/overlay_winx64/overlay_exe_winx64/overlay_exe.rc index ceb41349750..7ca53f5b3b0 100644 --- a/overlay_winx64/overlay_exe_winx64/overlay_exe.rc +++ b/overlay_winx64/overlay_exe_winx64/overlay_exe.rc @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble_ol_helper_x64.exe" VALUE "ProductName", "Mumble" diff --git a/src/mumble.pri b/src/mumble.pri index 205e5c280f8..878e590b9b3 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -8,7 +8,7 @@ include(../qmake/qt.pri) include(../qmake/rcc.pri) include(../qmake/pkgconfig.pri) -VERSION = 1.3.0 +VERSION = 1.4.0 DIST = mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h Version.h OSInfo.h SSL.h CONFIG += qt thread debug_and_release warn_on DEFINES *= MUMBLE_VERSION_STRING=$$VERSION diff --git a/src/mumble/mumble.plist b/src/mumble/mumble.plist index 930cfd0aba1..fbf8696be06 100644 --- a/src/mumble/mumble.plist +++ b/src/mumble/mumble.plist @@ -26,7 +26,7 @@ CFBundleVersion - 1.3.0 + 1.4.0 NSHumanReadableCopyright Copyright (c) 2005-2019 The Mumble Developers NSPrincipalClass diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc index 77104910d92..95e25ee40bb 100644 --- a/src/mumble/mumble.rc +++ b/src/mumble/mumble.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "../../icons/mumble.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -34,8 +34,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble.exe" VALUE "ProductName", "Mumble" diff --git a/src/mumble/mumble_dll.rc b/src/mumble/mumble_dll.rc index a8d555de0a9..0338ecb9954 100755 --- a/src/mumble/mumble_dll.rc +++ b/src/mumble/mumble_dll.rc @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Mumble - Low-latency VoIP client" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "mumble_app.dll" VALUE "ProductName", "Mumble" diff --git a/src/murmur/murmur.plist b/src/murmur/murmur.plist index d2832b54ec8..70101d480a5 100644 --- a/src/murmur/murmur.plist +++ b/src/murmur/murmur.plist @@ -13,7 +13,7 @@ CFBundleSignature MMUR CFBundleVersion - 1.3.0 + 1.4.0 NSHumanReadableCopyright Copyright (c) 2005-2019 The Mumble Developers diff --git a/src/murmur/murmur.rc b/src/murmur/murmur.rc index aeef34e737a..4738635752b 100644 --- a/src/murmur/murmur.rc +++ b/src/murmur/murmur.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "../../icons/murmur.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 @@ -34,8 +34,8 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The Mumble Developers" VALUE "FileDescription", "Murmur - Low-latency VoIP server" - VALUE "FileVersion", "1.3.0" - VALUE "ProductVersion", "1.3.0" + VALUE "FileVersion", "1.4.0" + VALUE "ProductVersion", "1.4.0" VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers" VALUE "OriginalFilename", "murmur.exe" VALUE "ProductName", "Mumble" diff --git a/themes/Mumble b/themes/Mumble index 1d48b123d2e..9c68c145383 160000 --- a/themes/Mumble +++ b/themes/Mumble @@ -1 +1 @@ -Subproject commit 1d48b123d2e62dab348e08810787e41a7511be69 +Subproject commit 9c68c1453837b82f69e93d7df2dbdd086d96f27d