New upstream release

2023-08-24 17:27:59 +02:00 · 2023-05-04 21:32:27 +02:00
16 changed files with 69 additions and 24 deletions
@@ -1,8 +1,24 @@
-[ 10.0.8 ]
+[ 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

-[ 10.0.7 ]
+[ 12.0.7 ]

 * Enable os-prober /after/ grub has been installed.

@@ -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.

@@ -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
@@ -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
@@ -1,3 +1,21 @@
+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
@@ -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,6 +13,7 @@ Package: calamares-settings-debian
 Architecture: all
 Depends: calamares,
         cryptsetup,
+         libglib2.0-bin,
         keyutils,
         pkexec,
         qml-module-qtquick-window2,
@@ -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
@@ -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
@@ -2,22 +2,24 @@

 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:
@@ -4,7 +4,7 @@
 #

 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.
@@ -2,7 +2,7 @@

 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 MEDIUM_PATH="/run/live/medium"
-RELEASE="bookworm"
+RELEASE="trixie"

 if [ "$1" = "-u" ]; then
    umount $CHROOT/$MEDIUM_PATH
Author	SHA1	Message	Date
Jonathan Carter	77d2a2c381	New upstream release	2023-08-24 17:27:59 +02:00
Jonathan Carter	291444b863	New upstream release	2023-05-04 21:32:27 +02:00