From 205fc4f948fb0d9ac211fca97723be8046170eee Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 7 Dec 2020 14:24:45 +0100 Subject: [PATCH] Changes: pre-release housekeeping --- CHANGES | 11 +++++++---- CMakeLists.txt | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 290d12a41..84b9e3937 100644 --- a/CHANGES +++ b/CHANGES @@ -7,16 +7,19 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.36 (unreleased) # +# 3.2.35.1 (2020-12-07) # This release contains contributions from (alphabetically by first name): - Anubhav Choudhary + - Matti Hyttinen -## Core ## - - No core changes yet +Some strange string artifacts appeared, leading to `{1?}` being +displayed in various user-facing messages. These have been removed +and the translations updated. ## Modules ## - - No module changes yet + - The *initcpiocfg* module would sometimes configure the system to ask + for a passphrase, when none is needed. # 3.2.35 (2020-11-30) # diff --git a/CMakeLists.txt b/CMakeLists.txt index 976823805..c7c59a201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.36 + VERSION 3.2.35.1 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS #