From e0dd4e665c8db5cd64357b259dd822834700a6fd Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Mon, 9 Jul 2018 20:48:09 -0500
Subject: [PATCH] Actually install the .desktop file.

FIXME: This is super hacky and breaks rules.
---
 debian/calamares-settings-lubuntu.install           | 2 +-
 debian/calamares-settings-lubuntu.lintian-overrides | 3 +++
 debian/changelog                                    | 1 +
 lubuntu/{1200-calamares => calamares.desktop}       | 4 ----
 lubuntu/modules/shellprocess.conf                   | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 debian/calamares-settings-lubuntu.lintian-overrides
 rename lubuntu/{1200-calamares => calamares.desktop} (78%)

diff --git a/debian/calamares-settings-lubuntu.install b/debian/calamares-settings-lubuntu.install
index a81a53a..cf39e3e 100644
--- a/debian/calamares-settings-lubuntu.install
+++ b/debian/calamares-settings-lubuntu.install
@@ -1,4 +1,4 @@
-lubuntu/1200-calamares lib/live/config/
+lubuntu/calamares.desktop etc/skel/Desktop/
 lubuntu/branding/ etc/calamares/
 lubuntu/modules/ etc/calamares/
 lubuntu/settings.conf etc/calamares/
diff --git a/debian/calamares-settings-lubuntu.lintian-overrides b/debian/calamares-settings-lubuntu.lintian-overrides
new file mode 100644
index 0000000..12004a1
--- /dev/null
+++ b/debian/calamares-settings-lubuntu.lintian-overrides
@@ -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
diff --git a/debian/changelog b/debian/changelog
index c076a3d..cbac160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ calamares-settings-ubuntu (4) UNRELEASED; urgency=medium
   * Enable GeoIP support by default, to get accurate timezone readings.
   * Make image and text IDs unique in the slideshow.
   * 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
 
diff --git a/lubuntu/1200-calamares b/lubuntu/calamares.desktop
similarity index 78%
rename from lubuntu/1200-calamares
rename to lubuntu/calamares.desktop
index 0058047..a9796fe 100755
--- a/lubuntu/1200-calamares
+++ b/lubuntu/calamares.desktop
@@ -1,6 +1,3 @@
-#!/bin/sh
-
-cat > "/home/lubuntu/Desktop/calamares.desktop" << EOF
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
@@ -13,4 +10,3 @@ Icon=calamares
 Terminal=false
 StartupNotify=true
 Categories=Qt;System;
-EOF
diff --git a/lubuntu/modules/shellprocess.conf b/lubuntu/modules/shellprocess.conf
index b290e9f..eb7c9ec 100644
--- a/lubuntu/modules/shellprocess.conf
+++ b/lubuntu/modules/shellprocess.conf
@@ -3,3 +3,4 @@ timeout: 60
 script:
   - "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"
+  - "rm @@ROOT@@/home/*/calamares.desktop"