New upstream release

CHANGELOG

@@ -1,3 +1,8 @@
+[ 13.0.12 ]
+
+ * Initial Ceratopsian artwork changes
+ * Support for alternate media paths (Debian bug: #1089618)
+
 [ 13.0.11 ]
 
  * Fix typo in filename
@@ -5,7 +10,7 @@
 
 [ 13.0.10 ]
 
- * Make script names less generic and namespace under /usr/share/calamare
+ * Make script names less generic and namespace under /usr/share/calamares
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021156
 
 [ 13.0.9 ]

calamares/branding/debian/branding.desc

@@ -24,18 +24,16 @@ sidebar: widget
 navigation: widget
 
 images:
-#    productBanner:       "/usr/share/desktop-base/emerald-theme/grub/grub-16x9.png"
     productLogo:         "debian-logo.png"
     productIcon:         "debian-logo.png"
     productWelcome:      "welcome.png"
-#    productWallpaper:    ""
 
 slideshow:               "show.qml"
 
 style:
-   SidebarBackground:    "#010027"
+   SidebarBackground:    "#26475b"
    SidebarText:          "#FFFFFF"
    SidebarTextCurrent:   "#fbfbfb"
-   SidebarBackgroundCurrent: "#017877"
+   SidebarBackgroundCurrent: "#265370"
 
 slideshowAPI: 2

debian/changelog

@@ -1,3 +1,12 @@
+calamares-settings-debian (13.0.12-1) unstable; urgency=medium
+
+  * New upstream release
+    - Includes initial Caretopsia artwork for Trixie
+    - Support more than one value for the media path
+      (Closes: #1089618)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 20 Dec 2024 15:01:36 +0200
+
 calamares-settings-debian (13.0.11-1) unstable; urgency=medium
 
   * New upstream release

debian/files

@@ -0,0 +1 @@
+calamares-settings-debian_13.0.12-1_source.buildinfo utils optional

helpers/calamares-sources-media

@@ -1,9 +1,17 @@
 #!/bin/sh
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-MEDIUM_PATH="/run/live/medium"
+KNOWN_MEDIUM_PATHS="/run/live/medium /run/initramfs/live"
 RELEASE="trixie"
 
+# Support both dracut and initramfs configurations to avoid substitutions
+# in live-build, see: #1089618
+for path in $KNOWN_MEDIUM_PATHS; do
+    if [ "$(mount | grep $path | cut -f3 -d" ")" = "$path" ]; then
+        MEDIUM_PATH=$path
+    fi
+done
+
 if [ "$1" = "-u" ]; then
     umount $CHROOT/$MEDIUM_PATH
     rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list