New upstream release

CHANGELOG

@@ -1,3 +1,24 @@
+[ 13.0.11 ]
+
+ * Fix typo in filename
+ * Move scripts to helpers
+
+[ 13.0.10 ]
+
+ * Make script names less generic and namespace under /usr/share/calamare
+   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021156
+
+[ 13.0.9 ]
+
+ * Bump minimum storage required to 15G
+   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=#1037123
+ * Update copyright years 
+ * Fix dconf entry for calamares launcher (fixes launcher on GNOME)
+ * Use trim by default for encrypted media
+   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001192
+ * Use idle cycles to preload calamares binary and libraries
+   for faster startup
+
 [ 13.0.8 ]
 
  * Move lukskeyconfig further up the task chain

COPYING

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2016-2023, Jonathan Carter <jcc@debian.org>
+Copyright (c) 2016-2024, 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

@@ -26,10 +26,19 @@ else
     chmod +x $DESKTOP/calamares-install-debian.desktop
 fi
 
-# Set desktop launcher as trusted under gnome/xfce (See: #1037299)
+# Set desktop launcher as trusted under Xfce (See: #1037299)
+if [ "$XDG_CURRENT_DESKTOP" = "XFCE" ]; then
     gio set --type=string ~/Desktop/calamares-install-debian.desktop \
         metadata::trusted true
     gio set --type=string ~/Desktop/calamares-install-debian.desktop \
         metadata::xfce-exe-checksum \
         "$(sha256sum ~/Desktop/calamares-install-debian.desktop | cut -f1 -d' ')"
     touch ~/Desktop/calamares-install-debian.desktop
+fi
+
+# Preload calamares binaries and libraries using idle disk cycles
+# so that it launches faster
+ionice -C Idle cat /usr/bin/calamares > /dev/null
+for file in $(ldd /usr/bin/calamares | awk '{print $3}'): do
+    ionice -C Idle cat $file > /dev/null
+done

calamares-modules/bootloader-config/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "bootloader-config"
 interface:  "process"
-command:    "/usr/sbin/bootloader-config"
+command:    "/usr/share/calamares/helpers/calamares-bootloader-config"
 timeout:    600

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

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "dpkg-unsafe-io-undo"
 interface:  "process"
-command:    "/usr/sbin/dpkg-unsafe-io -u"
+command:    "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io -u"
 timeout:    600

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

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "dpkg-unsafe-io"
 interface:  "process"
-command:    "/usr/sbin/dpkg-unsafe-io"
+command:    "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io"
 timeout:    600

calamares-modules/sources-final/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "sources-final"
 interface:  "process"
-command:    "/usr/sbin/sources-final"
+command:    "/usr/share/calamares/helpers/calamares-sources-final"
 timeout:    600

calamares-modules/sources-media-unmount/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "sources-media-unmount"
 interface:  "process"
-command:    "/usr/sbin/sources-media -u"
+command:    "/usr/share/calamares/helpers/calamares-sources-media -u"
 timeout:    600

calamares-modules/sources-media/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "sources-media"
 interface:  "process"
-command:    "/usr/sbin/sources-media"
+command:    "/usr/share/calamares/helpers/calamares-sources-media"
 timeout:    600

calamares/modules/fstab.conf

@@ -8,4 +8,4 @@ ssdExtraMountOptions:
     xfs: discard
     swap: discard
     btrfs: discard,compress=lzo
-crypttabOptions: luks,keyscript=/bin/cat
+crypttabOptions: luks,discard,keyscript=/bin/cat

calamares/modules/welcome.conf

@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
 requirements:
-    requiredStorage:    10
+    requiredStorage:    15
     requiredRam:        1.0
     check:
         - storage

conf/96_calamares-settings-debian.gschema.override

@@ -1,6 +1,6 @@
 # Launcher icons
 [org.gnome.shell]
-favorite-apps=['install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
+favorite-apps=['calamares-install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
 
 # We don't want the screensaver to enable on the live media while installing
 [org.gnome.desktop.lockdown]

debian/changelog

@@ -1,3 +1,16 @@
+calamares-settings-debian (13.0.11-1) unstable; urgency=medium
+
+  * New upstream release
+    - Make script names less generic and namespace (Closes: #1021156)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 23 Aug 2024 17:48:32 +0200
+
+calamares-settings-debian (13.0.9-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1037123, #1001192)
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 22 Aug 2024 18:54:20 +0200
+
 calamares-settings-debian (13.0.8-1) unstable; urgency=medium
 
   * New upstream release

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: calamares-settings-debian
 Source: https://gitlab.com/highvoltage/calamares-settings-debian
 
 Files: *
-Copyright: 2016-2023, Jonathan Carter <jcc@debian.org>
+Copyright: 2016-2024, Jonathan Carter <jcc@debian.org>
 License: ISC
 
 Files: calamares/branding/debian/*png

debian/install

@@ -1,6 +1,6 @@
 calamares etc
 calamares-modules/* usr/lib/calamares/modules
-scripts/* usr/sbin
+helpers/* usr/share/calamares/helpers
 *.desktop usr/share/applications
 calamares-install-debian usr/bin
 artwork/install-debian.png usr/share/pixmaps