Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: calamares-settings-deb...@packages.debian.org
Control: affects -1 + src:calamares-settings-debian
User: release.debian....@packages.debian.org
Usertags: pu
[ Reason ]
This update fixes two bugs still found in Debian 12 live sessions:
- BTRFS installations with Calamares currently fail
(Debian bug: #180158)
- On KDE, the calamares icon isn't displayed (currently worked
around in live-build, so the bug is still present when building
on other build systems
(Debian bug: #1057853)
[ Impact ]
If this update isn't approved, btrfs installations will continue
to fail and the calamares icon will in some cases be absent from
the live media on KDE sessions.
[ Tests ]
I build the package in a bookworm chroot, and tested it on
current installation media. Both bugs were successfully solved
with no other noticable effect.
[ Risks ]
These are quite trivial fixes, I don't expect any complications.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Here is the debdiff that contains all the changes:
"""
diff -Nru calamares-settings-debian-12.0.9/debian/changelog
calamares-settings-debian-12.0.9/debian/changelog
--- calamares-settings-debian-12.0.9/debian/changelog 2024-08-22
16:35:51.000000000 +0200
+++ calamares-settings-debian-12.0.9/debian/changelog 2024-09-03
13:27:38.000000000 +0200
@@ -1,3 +1,12 @@
+calamares-settings-debian (12.0.9-1+deb12u2) bookworm; urgency=medium
+
+ * Fix missing calamares launcher on KDE desktops
+ (Closes: #1057853)
+ * Fix broken btrfs space_cache option
+ (Closes: #1080158)
+
+ -- Jonathan Carter <j...@debian.org> Tue, 03 Sep 2024 13:27:38 +0200
+
calamares-settings-debian (12.0.9-1+deb12u1) bookworm; urgency=medium
* Fix Xfce launcher permission issue (Closes: #1037299)
diff -Nru
calamares-settings-debian-12.0.9/debian/patches/remove-btrfs-spacecache-setting
calamares-settings-debian-12.0.9/debian/patches/remove-btrfs-spacecache-setting
---
calamares-settings-debian-12.0.9/debian/patches/remove-btrfs-spacecache-setting
1970-01-01 02:00:00.000000000 +0200
+++
calamares-settings-debian-12.0.9/debian/patches/remove-btrfs-spacecache-setting
2024-09-03 13:27:38.000000000 +0200
@@ -0,0 +1,20 @@
+Description: Remove static btrfs space_cache settings
+ Calamares sets an option "space_cache", which breaks with newer kernels,
+ where it should be set to "space_cache=v2". Since "space_cache=v2" is
+ also default now, this hardcoded option can just be removed, which this
+ patch does.
+Author: Jonathan Carter <j...@debian.org>
+Bug-Debian: https://bugs.debian.org/1080158
+Last-Update: 2024-09-03
+
+--- calamares-settings-debian-12.0.9.orig/calamares/modules/fstab.conf
++++ calamares-settings-debian-12.0.9/calamares/modules/fstab.conf
+@@ -1,7 +1,7 @@
+ ---
+ mountOptions:
+ default: defaults,noatime
+- btrfs: defaults,noatime,space_cache,autodefrag
++ btrfs: defaults,noatime,autodefrag
+ ssdExtraMountOptions:
+ ext4: discard
+ jfs: discard
diff -Nru
calamares-settings-debian-12.0.9/debian/patches/remove-calamares-icon-gnome-startup-hint
calamares-settings-debian-12.0.9/debian/patches/remove-calamares-icon-gnome-startup-hint
---
calamares-settings-debian-12.0.9/debian/patches/remove-calamares-icon-gnome-startup-hint
1970-01-01 02:00:00.000000000 +0200
+++
calamares-settings-debian-12.0.9/debian/patches/remove-calamares-icon-gnome-startup-hint
2024-09-03 13:27:27.000000000 +0200
@@ -0,0 +1,18 @@
+Description: Remove calamares icon desktop entry gnome startup hint
+ The GNOME startup hint in the XDG startup desktop file add-calamares-icon
+ contains a line "X-GNOME-Autostart-Phase=Initialization" which causes this
+ script not to run on KDE on Debian 12.x.
+ .
+ For more information, please refer to the Debian bug below.
+Author: Jonathan Carter <j...@debian.org>
+Bug-Debian: https://bugs.debian.org/1057853
+
+
+--- calamares-settings-debian-12.0.9.orig/conf/calamares-desktop-icon.desktop
++++ calamares-settings-debian-12.0.9/conf/calamares-desktop-icon.desktop
+@@ -5,5 +5,4 @@ Exec=add-calamares-desktop-icon
+ StartupNotify=false
+ NoDisplay=true
+
+-X-GNOME-Autostart-Phase=Initialization
+ X-KDE-autostart-phase=1
diff -Nru calamares-settings-debian-12.0.9/debian/patches/series
calamares-settings-debian-12.0.9/debian/patches/series
--- calamares-settings-debian-12.0.9/debian/patches/series 2024-08-22
16:35:51.000000000 +0200
+++ calamares-settings-debian-12.0.9/debian/patches/series 2024-09-03
13:27:38.000000000 +0200
@@ -1 +1,3 @@
fix-xfce-launcher
+remove-calamares-icon-gnome-startup-hint
+remove-btrfs-spacecache-setting
"""
thanks,
-Jonathan
