Actually install the .desktop file.

FIXME: This is super hacky and breaks rules.
ubuntu/focal
Simon Quigley 7 years ago
parent 67a1f7ebc9
commit e0dd4e665c

@ -1,4 +1,4 @@
lubuntu/1200-calamares lib/live/config/ lubuntu/calamares.desktop etc/skel/Desktop/
lubuntu/branding/ etc/calamares/ lubuntu/branding/ etc/calamares/
lubuntu/modules/ etc/calamares/ lubuntu/modules/ etc/calamares/
lubuntu/settings.conf etc/calamares/ lubuntu/settings.conf etc/calamares/

@ -0,0 +1,3 @@
# Although it's technically against policy, in this case it's justified because it's the only way
calamares-settings-lubuntu: package-contains-file-in-etc-skel etc/skel/Desktop/
calamares-settings-lubuntu: package-contains-file-in-etc-skel etc/skel/Desktop/calamares.desktop

1
debian/changelog vendored

@ -5,6 +5,7 @@ calamares-settings-ubuntu (4) UNRELEASED; urgency=medium
* Enable GeoIP support by default, to get accurate timezone readings. * Enable GeoIP support by default, to get accurate timezone readings.
* Make image and text IDs unique in the slideshow. * Make image and text IDs unique in the slideshow.
* Ensure that slideshow images correctly respond to their text. * Ensure that slideshow images correctly respond to their text.
* Actually install the .desktop file.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 09 Jul 2018 17:51:16 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Mon, 09 Jul 2018 17:51:16 -0500

@ -1,6 +1,3 @@
#!/bin/sh
cat > "/home/lubuntu/Desktop/calamares.desktop" << EOF
#!/usr/bin/env xdg-open #!/usr/bin/env xdg-open
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
@ -13,4 +10,3 @@ Icon=calamares
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true
Categories=Qt;System; Categories=Qt;System;
EOF

@ -3,3 +3,4 @@ timeout: 60
script: script:
- "cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)" - "cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)"
- "[ -d /sys/firmware/efi ] && chroot @@ROOT@@ apt-cdrom add && chroot @@ROOT@@ sed -e '/deb http/ s/^#*/#/' -i /etc/apt/sources.list && chroot @@ROOT@@ apt update && chroot @@ROOT@@ apt -y install grub-efi-amd64-bin && chroot @@ROOT@@ sed -i 's/#deb/deb/' /etc/apt/sources.list || exit 0" - "[ -d /sys/firmware/efi ] && chroot @@ROOT@@ apt-cdrom add && chroot @@ROOT@@ sed -e '/deb http/ s/^#*/#/' -i /etc/apt/sources.list && chroot @@ROOT@@ apt update && chroot @@ROOT@@ apt -y install grub-efi-amd64-bin && chroot @@ROOT@@ sed -i 's/#deb/deb/' /etc/apt/sources.list || exit 0"
- "rm @@ROOT@@/home/*/calamares.desktop"

Loading…
Cancel
Save