New upstream release

CHANGELOG

@@ -1,3 +1,49 @@
+[ 13.0.1 ]
+
+ * Initial release for trixie
+   - Update sources.list writer and media sources
+ * Update copyright years
+ * Update installer artwork (egg theme)
+ * Rename launchers (partial fix towards #1021156)
+ * Mark desktop launchers as trusted for xfce/gnome (#1037299)
+
+[ 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
+ * Update the sources-media script to use bookworm
+
 [ 12.0.1 ]
 
  * Initial branding description and sources.list changes for bookworm

COPYING

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2016-2020, Jonathan Carter <jcc@debian.org>
+Copyright (c) 2016-2023, Jonathan Carter <jcc@debian.org>
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
 

add-calamares-desktop-icon

@@ -13,15 +13,23 @@ mkdir -p $DESKTOP
 # Among the Debian desktop environments, LXDE is the only one
 # that behaves completely different.
 if [ -f /usr/bin/lxsession ]; then
-    echo "[Desktop Entry]" > $DESKTOP/install-debian.desktop
-    echo "Type=Link" >> $DESKTOP/install-debian.desktop
-    echo "Name=Install Debian" >> $DESKTOP/install-debian.desktop
-    echo "Icon=install-debian" >> $DESKTOP/install-debian.desktop
-    echo "URL=/usr/share/applications/install-debian.desktop" \
-          >> $DESKTOP/install-debian.desktop
+    echo "[Desktop Entry]" > $DESKTOP/calamares-install-debian.desktop
+    echo "Type=Link" >> $DESKTOP/calamares-install-debian.desktop
+    echo "Name=Install Debian" >> $DESKTOP/calamares-install-debian.desktop
+    echo "Icon=install-debian" >> $DESKTOP/calamares-install-debian.desktop
+    echo "URL=/usr/share/applications/calamares-install-debian.desktop" \
+          >> $DESKTOP/calamares-install-debian.desktop
 else
-    cp /usr/share/applications/install-debian.desktop $DESKTOP
+    cp /usr/share/applications/calamares-install-debian.desktop $DESKTOP
     # Xfce needs this executable otherwise it complains, everything
     # else doesn't seem to care either way.
-    chmod +x $DESKTOP/install-debian.desktop
+    chmod +x $DESKTOP/calamares-install-debian.desktop
 fi
+
+# Set desktop launcher as trusted under gnome/xfce (See: #1037299)
+    gio set --type=string ~/Desktop/install-debian.desktop \
+        metadata::trusted true
+    gio set --type=string ~/Desktop/install-debian.desktop \
+        metadata::xfce-exe-checksum \
+        "$(sha256sum ~/Desktop/install-debian.desktop | cut -f1)"
+    touch ~/Desktop/install-debian.desktop

calamares-install-debian

@@ -0,0 +1,26 @@
+#!/bin/sh
+###
+# Wrapper for running calamares on Debian live media
+###
+
+# 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
+xhost -si:localuser:root
+
+# Restore stale fstab, for what it's worth
+sudo mv /etc/fstab.orig.calamares /etc/fstab

calamares-modules/dpkg-unsafe-io-undo/module.desc

@@ -1,6 +1,6 @@
 ---
 type:       "job"
-name:       "re-enable-dpkg-sync"
+name:       "dpkg-unsafe-io-undo"
 interface:  "process"
 command:    "/usr/sbin/dpkg-unsafe-io -u"
 timeout:    600

calamares-modules/dpkg-unsafe-io/module.desc

@@ -1,6 +1,6 @@
 ---
 type:       "job"
-name:       "disable-dpkg-sync"
+name:       "dpkg-unsafe-io"
 interface:  "process"
 command:    "/usr/sbin/dpkg-unsafe-io"
 timeout:    600

calamares/branding/debian/branding.desc

@@ -9,10 +9,10 @@ windowPlacement: center
 strings:
     productName:         Debian GNU/Linux
     shortProductName:    Debian
-    version:             12 (bookworm)
-    shortVersion:        12
-    versionedName:       Debian 12 (bookworm)
-    shortVersionedName:  Debian 12
+    version:             13
+    shortVersion:        13
+    versionedName:       Debian 13
+    shortVersionedName:  Debian 13
     bootloaderEntryName: Debian
     productUrl:          https://debian.org
     supportUrl:          https://www.debian.org/support

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,69 @@
+calamares-settings-debian (13.0.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - Initial trixie support
+  * Add dependency: libglib2.0-bin
+    - Plus upstream fixes for desktop launcher (Closes: #1037299)
+  * Update standards version to 4.6.2
+  * Update copyright years
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 24 Aug 2023 16:49:49 +0200
+
+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
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 19 May 2022 14:51:29 +0200
+
 calamares-settings-debian (12.0.1-1) unstable; urgency=medium
 
   [ Debian Janitor ]

debian/control

@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Jonathan Carter <jcc@debian.org>
 Build-Depends: debhelper-compat (= 13), libglib2.0-bin
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://salsa.debian.org/live-team/calamares-settings-debian
 Vcs-Git: https://salsa.debian.org/live-team/calamares-settings-debian-packaging.git
@@ -13,7 +13,9 @@ Package: calamares-settings-debian
 Architecture: all
 Depends: calamares,
          cryptsetup,
+         libglib2.0-bin,
          keyutils,
+         pkexec,
          qml-module-qtquick-window2,
          qml-module-qtquick2,
          ${misc:Depends}

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: calamares-settings-debian
 Source: https://gitlab.com/highvoltage/calamares-settings-debian
 
 Files: *
-Copyright: 2016-2020, Jonathan Carter <jcc@debian.org>
+Copyright: 2016-2023, Jonathan Carter <jcc@debian.org>
 License: ISC
 
 Files: calamares/branding/debian/*png
@@ -11,7 +11,7 @@ Copyright: 2019 Isabelle Simpkins <isy@koipond.org.uk>
 License: CC-BY-SA-3.0
 
 Files: debian/*
-Copyright: 2016-2020 Jonathan Carter <jcc@debian.org>
+Copyright: 2016-2023 Jonathan Carter <jcc@debian.org>
 License: ISC
 
 Files: calamares/branding/debian/show.qml

debian/install

@@ -2,7 +2,7 @@ calamares etc
 calamares-modules/* usr/lib/calamares/modules
 scripts/* usr/sbin
 *.desktop usr/share/applications
-install-debian usr/bin
+calamares-install-debian usr/bin
 artwork/install-debian.png usr/share/pixmaps
 conf/96_calamares-settings-debian.gschema.override usr/share/glib-2.0/schemas
 conf/calamares-desktop-icon.desktop etc/xdg/autostart

install-debian

@@ -1,15 +0,0 @@
-#!/bin/sh
-###
-# Wrapper for running calamares on Debian live media
-###
-
-# Stale file left behind by live-build that messes with partitioning
-sudo mv /etc/fstab /etc/fstab.orig.calamares
-
-# Access control to run calamares as root for xwayland
-xhost +si:localuser:root
-pkexec calamares
-xhost -si:localuser:root
-
-# Restore stale fstab, for what it's worth
-sudo mv /etc/fstab.orig.calamares /etc/fstab

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

@@ -4,18 +4,22 @@
 #
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-RELEASE="bookworm"
+RELEASE="trixie"
 
 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

scripts/sources-media

@@ -2,7 +2,7 @@
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 MEDIUM_PATH="/run/live/medium"
-RELEASE="bullseye"
+RELEASE="trixie"
 
 if [ "$1" = "-u" ]; then
     umount $CHROOT/$MEDIUM_PATH