From 9410da27dc8fb1e24f1772801b7b702fb47b3c5c Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sun, 14 Nov 2010 13:08:07 +0000 Subject: [PATCH] - add SpaceFun alternative at maximum level (default Squeeze theme). - rename grub alternative to add png extension so grub can find it. - run sync before updating grub to be sure the grub background has been written to disk. * debian/prerm: - rename grub alternative to add png extension. - install grub theme and script. * grub: - add SpaceFun grub theme. - add a grub_background.sh which will override settings in grub and correctly set the default theme. --- Makefile | 4 ++++ debian/changelog | 15 ++++++++++++--- debian/postinst | 5 +++-- debian/prerm | 4 ++-- grub/grub_background.sh | 3 +++ {backgrounds => grub}/spacefun-grub.png | Bin 6 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 grub/grub_background.sh rename {backgrounds => grub}/spacefun-grub.png (100%) diff --git a/Makefile b/Makefile index 1e6116e..cad5cb6 100644 --- a/Makefile +++ b/Makefile @@ -75,3 +75,7 @@ install: $(INSTALL) gdm3/background.svg $(DESTDIR)/usr/share/images/desktop-base/login-background.svg $(INSTALL) gdm3/10_desktop-base $(DESTDIR)/usr/share/gdm/greeter-config + # grub + $(INSTALL) grub/spacefun-grub.png $(DESTDIR)/usr/share/images/desktop-base/ + $(INSTALL) grub/grub_background.sh $(DESTDIR)/usr/share/desktop-base/ + diff --git a/debian/changelog b/debian/changelog index b54456d..d850b4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,23 +5,32 @@ desktop-base (6.0.0~) UNRELEASED; urgency=low - update standards version to 3.9.1. * backgrounds: - add SpaceFun wallpaper - - add SpaceFun grub theme. * slashy: - add SpaceFun theme. * kdm-theme: - add SpaceFun theme. - configure SpaceFun as the default theme. * debian/postinst: - - add SpaceFun alternative at maximum level (default Squeeze theme) + - add SpaceFun alternative at maximum level (default Squeeze theme). + - rename grub alternative to add png extension so grub can find it. + - run sync before updating grub to be sure the grub background has been + written to disk. + * debian/prerm: + - rename grub alternative to add png extension. * Makefile: - drop unused rules for KDE3 and Xfce 4.4. - add SpaceFun gdm3 theme. - add SpaceFun kdm theme. + - install grub theme and script. * {ksplash,kdm}-theme/moreblue-orbit{-default}: - drop “Debian” word from image to only use DFSG-free logo. closes: #587668 * debian/copyright updated for the new theme. + * grub: + - add SpaceFun grub theme. + - add a grub_background.sh which will override settings in grub and + correctly set the default theme. - -- Yves-Alexis Perez Sun, 14 Nov 2010 11:01:36 +0100 + -- Yves-Alexis Perez Sun, 14 Nov 2010 13:57:56 +0100 desktop-base (5.0.6) unstable; urgency=low diff --git a/debian/postinst b/debian/postinst index 1a4d888..94d541c 100644 --- a/debian/postinst +++ b/debian/postinst @@ -57,17 +57,18 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then # Alternatives for grub update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub \ + /usr/share/images/desktop-base/desktop-grub.png \ desktop-grub \ /usr/share/images/desktop-base/spacefun-grub.png 15 update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub \ + /usr/share/images/desktop-base/desktop-grub.png \ desktop-grub \ /usr/share/images/desktop-base/moreblue-orbit-grub.png 10 # GRUB background if which update-grub2 > /dev/null ; then + sync update-grub2 || true fi diff --git a/debian/prerm b/debian/prerm index 40fe91a..ae1b641 100644 --- a/debian/prerm +++ b/debian/prerm @@ -30,10 +30,10 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then /usr/share/images/desktop-base/gnome-splash-curves.png # remove grub alternatives - update-alternatives --remove desktop-grub \ + update-alternatives --remove desktop-grub.png \ /usr/share/images/desktop-base/spacefun-grub.png - update-alternatives --remove desktop-grub \ + update-alternatives --remove desktop-grub.png \ /usr/share/images/desktop-base/moreblue-orbit-grub.png fi diff --git a/grub/grub_background.sh b/grub/grub_background.sh new file mode 100644 index 0000000..7530623 --- /dev/null +++ b/grub/grub_background.sh @@ -0,0 +1,3 @@ +WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png +COLOR_NORMAL=white/black +COLOR_HIGHLIGHT=white/grey diff --git a/backgrounds/spacefun-grub.png b/grub/spacefun-grub.png similarity index 100% rename from backgrounds/spacefun-grub.png rename to grub/spacefun-grub.png