From 74419de5941e27bc227361b6d7971282d75a1be8 Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Fri, 12 Oct 2018 21:50:57 -0700 Subject: [PATCH] cleanup after new install file location --- debian/calamares-settings-lubuntu.lintian-overrides | 3 --- debian/changelog | 7 ++++--- lubuntu/modules/after_bootloader_context.conf | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 debian/calamares-settings-lubuntu.lintian-overrides diff --git a/debian/calamares-settings-lubuntu.lintian-overrides b/debian/calamares-settings-lubuntu.lintian-overrides deleted file mode 100644 index 12004a1..0000000 --- a/debian/calamares-settings-lubuntu.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# 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 4d240f2..b55b6af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ calamares-settings-ubuntu (26) cosmic; urgency=medium - * Lubuntu: fix check for EFI architecture. - * Lubuntu: fix location of installer .desktop. + * Lubuntu: fix check for EFI architecture. + * Lubuntu: fix location of installer .desktop. + * Lubuntu: remove Lintian overrides related to the old installer .desktop. - -- Walter Lapchynski Fri, 12 Oct 2018 18:39:27 -0700 + -- Walter Lapchynski Fri, 12 Oct 2018 21:04:44 -0700 calamares-settings-ubuntu (25) cosmic; urgency=medium diff --git a/lubuntu/modules/after_bootloader_context.conf b/lubuntu/modules/after_bootloader_context.conf index a1d2e6a..55a0a1b 100644 --- a/lubuntu/modules/after_bootloader_context.conf +++ b/lubuntu/modules/after_bootloader_context.conf @@ -6,4 +6,4 @@ dontChroot: false timeout: 120 firmwareType: - "*": "-for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done" + "*": "-for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/lubuntu-calamares.desktop || exit 0; done"