From cddee201e8856222ac713997666f53b45bd9aba7 Mon Sep 17 00:00:00 2001 From: Tom Dewey Date: Thu, 16 Nov 2023 14:59:39 +0000 Subject: [PATCH 1/2] qml: Fix no-customisation image write --- src/main.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.qml b/src/main.qml index 3b940c65a..9f7b109ac 100644 --- a/src/main.qml +++ b/src/main.qml @@ -1191,6 +1191,7 @@ ApplicationWindow { confirmwritepopup.askForConfirmation() } onNo: { + imageWriter.setImageCustomization("", "", "", "", "") confirmwritepopup.askForConfirmation() } onNoClearSettings: { From d729317c54b44f30e186a9820444229abc0942a9 Mon Sep 17 00:00:00 2001 From: Tom Dewey Date: Thu, 16 Nov 2023 10:43:08 +0000 Subject: [PATCH 2/2] meta: v1.8.3 --- debian/changelog | 9 ++++++++- src/CMakeLists.txt | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c21cdf6f..37fb4a20c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rpi-imager (1.8.3) unstable; urgency=medium + + * Home: Fixed "No filtering" option + * OS customisation: Fixed no-customisation flow + + -- Floris Bos Thu, 16 Nov 2023 14:00:00 +0200 + rpi-imager (1.8.2) unstable; urgency=medium * Home: Device filtering reworked to download OS list eagerly @@ -11,7 +18,7 @@ rpi-imager (1.8.2) unstable; urgency=medium * OS customisation: Allow empty PSK for 'Open' WiFi networks. * OS List: Use ImageList v4 URL - -- Floris Bos Thu, 15 Nov 2023 20:16:16 +0200 + -- Floris Bos Wed, 15 Nov 2023 20:16:16 +0200 rpi-imager (1.8.1) unstable; urgency=medium diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1cadd4d3..16356b716 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,8 +8,8 @@ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON) project(rpi-imager LANGUAGES CXX C) set(IMAGER_VERSION_MAJOR 1) set(IMAGER_VERSION_MINOR 8) -set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.2") -set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},2,0") +set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.3") +set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},3,0") add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}") add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV}) set(CMAKE_INCLUDE_CURRENT_DIR ON)