New upstream release

CHANGELOG

@@ -1,3 +1,35 @@
+[ 12.0.9 ]
+
+ * Fix typos in version numbers for last two changelog entries
+ * Install cryptsetup-initramfs, cryptsetup and keyutils (only) when needed
+   (required due to these packages only now existing on package pool,
+    not on the squashfs filesystem)
+
+[ 12.0.8 ]
+
+ * Do grub work within the chroot
+
+[ 12.0.7 ]
+
+ * Enable os-prober /after/ grub has been installed.
+
+[ 12.0.6 ]
+
+ * Enable os-prober
+
+[ 12.0.5 ]
+
+ * Update sources.list to include non-free-firmware and backports
+
+[ 12.0.4 ]
+
+ * Update artwork for Debian 12 (emerald theme)
+ * Make installer slide translatable
+
+[ 12.0.3 ]
+
+ * Work around hidpi issue (#992162)
+
 [ 12.0.2 ]
 
  * Fix dpkg-unsafe-io and dpkg-unsafe-io-undo names

calamares/branding/debian/show.qml

@@ -40,8 +40,8 @@ Presentation
         Text {
             anchors.horizontalCenter: background1.horizontalCenter
             anchors.top: background1.bottom
-            text: "Welcome to Debian GNU/Linux.<br/>"+
-                  "The rest of the installation is automated and should complete in a few minutes."
+            text: qsTr("Welcome to Debian GNU/Linux.<br/>"+
+                  "The rest of the installation is automated and should complete in a few minutes.")
             wrapMode: Text.WordWrap
             width: 600
             horizontalAlignment: Text.Center

debian/changelog

@@ -1,3 +1,52 @@
+calamares-settings-debian (12.0.9-1) unstable; urgency=medium
+
+  * New upstream release
+    - Deal with changes in how luks tools are installed from live media
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 04 May 2023 20:47:17 +0200
+
+calamares-settings-debian (12.0.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - Make grub changes in the correct place (within the chroot)
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 26 Apr 2023 14:25:34 +0200
+
+calamares-settings-debian (12.0.7-1) unstable; urgency=medium
+
+  * New upstream release
+    - Re-enable os-prober
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 26 Apr 2023 13:43:01 +0200
+
+calamares-settings-debian (12.0.5-2) unstable; urgency=medium
+
+  * Depend on pkexec (Closes: #1033930) 
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 04 Apr 2023 09:51:03 +0200
+
+calamares-settings-debian (12.0.5-1) unstable; urgency=medium
+
+  * New upstream release
+    - Update sources.list to include backports and non-free-firmware
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 06 Mar 2023 19:24:55 +0200
+
+calamares-settings-debian (12.0.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Bookworm artwork
+    - Make installer slide translatable
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 06 Mar 2023 12:33:33 +0200
+
+calamares-settings-debian (12.0.3-1) unstable; urgency=medium
+
+  * New upstream release
+    (work arounds hidpi issue, Closes: #992162)
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 02 Aug 2022 09:35:26 +0200
+
 calamares-settings-debian (12.0.2-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -14,6 +14,7 @@ Architecture: all
 Depends: calamares,
          cryptsetup,
          keyutils,
+         pkexec,
          qml-module-qtquick-window2,
          qml-module-qtquick2,
          ${misc:Depends}

install-debian

@@ -6,6 +6,17 @@
 # Stale file left behind by live-build that messes with partitioning
 sudo mv /etc/fstab /etc/fstab.orig.calamares
 
+# Allow Calamares to scale the window for hidpi displays
+# This is fixed in the Calamares 3.3.0 series, so we can remove this
+# once we switch to that
+# Upstream commit that will make this obsolete:
+#     https://github.com/calamares/calamares/commit/e9f011b686a0982fb7828e8ac02a8e0784d3b11f
+# Upstream bug:
+#     https://github.com/calamares/calamares/issues/1945
+# Debian bug:
+#     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992162
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+
 # Access control to run calamares as root for xwayland
 xhost +si:localuser:root
 pkexec calamares

scripts/bootloader-config

@@ -2,20 +2,26 @@
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 
-# Set secure permissions for the initramfs if we're configuring
+# Install luks utilities if needed.
+# Also, set secure permissions for the initramfs if we're configuring
 # full-disk-encryption. The initramfs is re-generated later in the
 # installation process so we only set the permissions snippet without
 # regenerating the initramfs right now:
 if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
     echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
+    chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils
 fi
 
 echo "Running bootloader-config..."
 
 if [ -d /sys/firmware/efi/efivars ]; then
     echo " * Installing grub-efi (uefi)..."
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64 cryptsetup keyutils
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
 else
     echo " * install grub... (bios)"
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
 fi
+
+# Re-enable os-prober:
+sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
+chroot $CHROOT /usr/sbin/update-grub

scripts/sources-final

@@ -8,14 +8,18 @@ RELEASE="bookworm"
 
 cat << EOF > $CHROOT/etc/apt/sources.list
 # See https://wiki.debian.org/SourcesList for more information.
-deb http://deb.debian.org/debian $RELEASE main
-deb-src http://deb.debian.org/debian $RELEASE main
+deb http://deb.debian.org/debian $RELEASE main non-free-firmware
+deb-src http://deb.debian.org/debian $RELEASE main non-free-firmware
 
-deb http://deb.debian.org/debian $RELEASE-updates main
-deb-src http://deb.debian.org/debian $RELEASE-updates main
+deb http://deb.debian.org/debian $RELEASE-updates main non-free-firmware
+deb-src http://deb.debian.org/debian $RELEASE-updates main non-free-firmware
 
-deb http://security.debian.org/debian-security/ $RELEASE-security main
-deb-src http://security.debian.org/debian-security/ $RELEASE-security main
+deb http://security.debian.org/debian-security/ $RELEASE-security main non-free-firmware
+deb-src http://security.debian.org/debian-security/ $RELEASE-security main non-free-firmware
+
+# Backports allow you to install newer versions of software made available for this release
+deb http://deb.debian.org/debian $RELEASE-backports main non-free-firmware
+deb-src http://deb.debian.org/debian $RELEASE-backports main non-free-firmware
 EOF
 
 exit 0