From 94efe49d68351e0b75a1e0b07e218675a745e5bc Mon Sep 17 00:00:00 2001 From: Raman Sarda Date: Mon, 9 Dec 2019 17:40:17 -0500 Subject: [PATCH] Modified lubuntu-grub-theme Summary: Removed post and pre installation scripts and associated files. Modified installation file accordingly. This just updates the theme. After this, user will have to manually add /boot/grub/themes/lubuntu-grub-theme/theme.txt to GRUB_THEME in /etc/default/grub and then run grub-update to actually see the theme in effect. Test Plan: For this diff, test case is rather simple. Just install lubuntu-grub-theme and make changes to /etc/default/grub as shown in summary. Run grub-update. That's it. Important part lies after this diff lands. lubuntu-grub-theme should be added to rSEED and rLUBUNTUMETAPACKAGING. Once both of them are landed, The new iso created should install the theme by default during installation of grub. Now, Ideally it shouldn't. (According to grub's manual) But looking at theme from mate, I can say it will. Spoiler alert: If it does, then we have a bug in grub. Reviewers: wxl, tsimonq2, kc2bez Reviewed By: kc2bez Subscribers: apt-ghetto Tags: #development_team Differential Revision: https://phab.lubuntu.me/D60 --- debian/changelog | 12 ++++++++-- debian/lubuntu-grub-theme.install | 1 - debian/lubuntu-grub-theme.postinst | 24 ------------------- debian/lubuntu-grub-theme.prerm | 23 ------------------ .../lubuntu-grub-theme/icons/ubuntu.png | 1 + src/etc/default/grub.d/lubuntu-grub-theme.cfg | 1 - 6 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 debian/lubuntu-grub-theme.postinst delete mode 100644 debian/lubuntu-grub-theme.prerm create mode 120000 src/boot/grub/themes/lubuntu-grub-theme/icons/ubuntu.png delete mode 100644 src/etc/default/grub.d/lubuntu-grub-theme.cfg diff --git a/debian/changelog b/debian/changelog index b71e4ba..c644658 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ -lubuntu-artwork (20.04.1) UNRELEASED; urgency=medium +lubuntu-artwork (20.04.1) focal; urgency=medium + [ Simon Quigley ] * Replace wall.png with a symbolic link to the default wallpaper. - -- Simon Quigley Thu, 07 Nov 2019 11:42:29 -0600 + [ Raman Sarda ] + * Modified lubuntu-grub-theme + - Removed postinstall and preinstall files. + - Removed cfg script from /etc/default/grub.d/ + - Modified install file accordingly. + - Make hummingbird logo appear on grub menu entry. + + -- Raman Sarda Sat, 09 Nov 2019 22:57:03 +0530 lubuntu-artwork (19.10.3) eoan; urgency=medium diff --git a/debian/lubuntu-grub-theme.install b/debian/lubuntu-grub-theme.install index 9788204..92dff1d 100644 --- a/debian/lubuntu-grub-theme.install +++ b/debian/lubuntu-grub-theme.install @@ -1,2 +1 @@ -src/etc/default/grub.d/lubuntu-grub-theme.cfg /etc/default/grub.d/ src/boot/grub/themes/lubuntu-grub-theme /boot/grub/themes/ diff --git a/debian/lubuntu-grub-theme.postinst b/debian/lubuntu-grub-theme.postinst deleted file mode 100644 index 0ac8c24..0000000 --- a/debian/lubuntu-grub-theme.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# postinst script for lubuntu-grub-theme - -#DEBHELPER# - -set -e - -case "$1" in - configure) - - update-grub - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/lubuntu-grub-theme.prerm b/debian/lubuntu-grub-theme.prerm deleted file mode 100644 index cff9ba5..0000000 --- a/debian/lubuntu-grub-theme.prerm +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# prerm script for lubuntu-grub-theme - -set -e - -#DEBHELPER# - -case "$1" in - remove|upgrade|deconfigure) - rm /etc/default/grub.d/lubuntu-grub-theme.cfg - update-grub - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/src/boot/grub/themes/lubuntu-grub-theme/icons/ubuntu.png b/src/boot/grub/themes/lubuntu-grub-theme/icons/ubuntu.png new file mode 120000 index 0000000..69295f4 --- /dev/null +++ b/src/boot/grub/themes/lubuntu-grub-theme/icons/ubuntu.png @@ -0,0 +1 @@ +lubuntu.png \ No newline at end of file diff --git a/src/etc/default/grub.d/lubuntu-grub-theme.cfg b/src/etc/default/grub.d/lubuntu-grub-theme.cfg deleted file mode 100644 index d3fc459..0000000 --- a/src/etc/default/grub.d/lubuntu-grub-theme.cfg +++ /dev/null @@ -1 +0,0 @@ -GRUB_THEME=/boot/grub/themes/lubuntu-grub-theme/theme.txt