Merge ~eeickmeyer/casper/+git/casper:master into casper:master

[Erich Eickmeyer]

Add Ubuntu Studio Calamares installer to desktop

Ubuntu Studio is switching from Ubiquity to Calamares. This commit should add /usr/share/applications/ubuntustudio-calamares.desktop to the DVD image desktop.

diff --git a/debian/changelog b/debian/changelog
index 58247f8..224a4e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ casper (1.447) UNRELEASED; urgency=medium
   [ Michael Hudson-Doyle ]
   * Add interactive network configuration.
 
+  [ Erich Eickmeyer ]
+  * Add Ubuntu Studio Clamares Installer as trusted executable
+
  -- Michael Hudson-Doyle <[e-mail]>  Wed, 06 May 2020 19:51:18 +1200
 
 casper (1.446) groovy; urgency=medium
@@ -423,7 +426,7 @@ casper (1.400) disco; urgency=medium
 
   * Add hmcdrv support for s390x ISO booting.
 
- -- Dimitri John Ledkov <[e-mail]>  Mon, 19 Nov 2018 15:42:56 +0000
+ -- Dimiubuntustudio-default-settings: package-contains-file-in-etc-skel etc/skel/.config/tri John Ledkov <[e-mail]>  Mon, 19 Nov 2018 15:42:56 +0000
 
 casper (1.399) cosmic; urgency=medium
 
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
index 3efb1a6..6dcef6a 100755
--- a/scripts/casper-bottom/25adduser
+++ b/scripts/casper-bottom/25adduser
@@ -81,7 +81,7 @@ RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null | sed 's/-/ /')" |
 if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
 	RELEASE="$RELEASE LTS"
 fi
-for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop /usr/share/applications/lubuntu-calamares.desktop; do
+for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop /usr/share/applications/lubuntu-calamares.desktop /usr/share/applications/ubuntustudio-calamares.desktop; do
     if [ -f "/root/$file" ]; then
         sed -i "s/RELEASE/$RELEASE/" "/root$file"
         chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop