diff --git a/Makefile b/Makefile index 9c395f9..74ab348 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GRUB_THEMES=lines-theme/grub softwaves-theme/grub +GRUB_THEMES=softwaves-theme/grub lines-theme/grub joy-theme/grub spacefun-theme/grub DEFAULT_BACKGROUND=desktop-background BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg backgrounds/*.tga backgrounds/*.xml) @@ -80,9 +80,6 @@ install-local: $(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml # grub - $(INSTALL) grub/joy-grub.png $(DESTDIR)/usr/share/images/desktop-base/ - $(INSTALL) grub/spacefun-grub.png $(DESTDIR)/usr/share/images/desktop-base/ - $(INSTALL) grub/spacefun-grub-widescreen.png $(DESTDIR)/usr/share/images/desktop-base/ $(INSTALL) grub/grub_background.sh $(DESTDIR)/usr/share/desktop-base/ # plymouth diff --git a/debian/changelog b/debian/changelog index ca53dff..423d85a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,10 @@ desktop-base (9.0.0~exp2) UNRELEASED; urgency=medium [ Aurélien COUDERC ] * Remove Moreblue theme from Lenny. - * Fix detection of update-initramfs. (Closes: #843727) + * Generate all GRUB bitmaps from SVG at build time instead of versionning + them. + + * Fix detection of update-initramfs. (Closes: #843727) -- Aurélien COUDERC Mon, 07 Nov 2016 22:28:06 +0100 diff --git a/debian/postinst b/debian/postinst index 5e8a9ec..4157671 100644 --- a/debian/postinst +++ b/debian/postinst @@ -177,18 +177,10 @@ softwaves 4x3 15 softwaves 16x9 15 lines 4x3 14 lines 16x9 14 -EOF - - # Old alternatives - while read background priority; do - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub \ - /usr/share/images/desktop-base/$background $priority - done << EOF -joy-grub.png 10 -spacefun-grub.png 10 -spacefun-grub-widescreen.png 10 +joy 4x3 14 +joy 16x9 14 +spacefun 4x3 14 +spacefun 16x9 14 EOF # GRUB background diff --git a/debian/preinst b/debian/preinst index 375359f..03a5bf7 100644 --- a/debian/preinst +++ b/debian/preinst @@ -63,6 +63,19 @@ EOF moreblue-orbit-wallpaper.svg moreblue-orbit-wallpaper-widescreen.svg EOF + + # Remove old alternatives for joy/spacefun grub themes now shipped in + # theme packs. + while read background; do + update-alternatives --remove \ + desktop-grub \ + /usr/share/images/desktop-base/$background + done << EOF +joy-grub.png +spacefun-grub.png +spacefun-grub-widescreen.png +EOF + fi fi diff --git a/debian/prerm b/debian/prerm index 7986203..8b6f593 100644 --- a/debian/prerm +++ b/debian/prerm @@ -131,16 +131,10 @@ softwaves 4x3 softwaves 16x9 lines 4x3 lines 16x9 -EOF - # For old alternatives - while read background; do - update-alternatives --remove \ - desktop-grub \ - /usr/share/images/desktop-base/$background - done << EOF -joy-grub.png -spacefun-grub.png -spacefun-grub-widescreen.png +joy 4x3 +joy 16x9 +spacefun 4x3 +spacefun 16x9 EOF ## *Lastly* remove *highest priority* alternative num_grub_efi_installed=$(dpkg-query --list "grub-efi*" 2> /dev/null | grep "^i" | wc -l) diff --git a/grub/joy-grub.png b/grub/joy-grub.png deleted file mode 100644 index 0b49b65..0000000 Binary files a/grub/joy-grub.png and /dev/null differ diff --git a/grub/spacefun-grub-widescreen.png b/grub/spacefun-grub-widescreen.png deleted file mode 100644 index 75dfa62..0000000 Binary files a/grub/spacefun-grub-widescreen.png and /dev/null differ diff --git a/grub/spacefun-grub.png b/grub/spacefun-grub.png deleted file mode 100644 index 365a62d..0000000 Binary files a/grub/spacefun-grub.png and /dev/null differ diff --git a/joy-theme/grub/Makefile b/joy-theme/grub/Makefile new file mode 100644 index 0000000..4869e1f --- /dev/null +++ b/joy-theme/grub/Makefile @@ -0,0 +1,22 @@ +dir = usr/share/desktop-base/joy-theme/grub + +files = \ + grub-4x3.png \ + grub-16x9.png + +build: $(files) + +clean: + rm -f grub-4x3.png grub-16x9.png + +install: + install -d $(DESTDIR)/$(dir) + $(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir) + +grub-4x3.png: grub-4x3.svg + rsvg-convert $< > $@ + +grub-16x9.png: grub-16x9.svg + rsvg-convert $< > $@ + +include ../../Makefile.inc diff --git a/joy-theme/grub/grub-16x9.svg b/joy-theme/grub/grub-16x9.svg new file mode 100644 index 0000000..939e5a1 --- /dev/null +++ b/joy-theme/grub/grub-16x9.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/joy-theme/grub/grub-4x3.svg b/joy-theme/grub/grub-4x3.svg new file mode 100644 index 0000000..3f8dec8 --- /dev/null +++ b/joy-theme/grub/grub-4x3.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spacefun-theme/grub/Makefile b/spacefun-theme/grub/Makefile new file mode 100644 index 0000000..3274e5a --- /dev/null +++ b/spacefun-theme/grub/Makefile @@ -0,0 +1,22 @@ +dir = usr/share/desktop-base/spacefun-theme/grub + +files = \ + grub-4x3.png \ + grub-16x9.png + +build: $(files) + +clean: + rm -f grub-4x3.png grub-16x9.png + +install: + install -d $(DESTDIR)/$(dir) + $(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir) + +grub-4x3.png: grub-4x3.svg + rsvg-convert $< > $@ + +grub-16x9.png: grub-16x9.svg + rsvg-convert $< > $@ + +include ../../Makefile.inc diff --git a/source/spacefun/grub.svg b/spacefun-theme/grub/grub-16x9.svg similarity index 100% rename from source/spacefun/grub.svg rename to spacefun-theme/grub/grub-16x9.svg diff --git a/spacefun-theme/grub/grub-4x3.svg b/spacefun-theme/grub/grub-4x3.svg new file mode 100644 index 0000000..a085f15 --- /dev/null +++ b/spacefun-theme/grub/grub-4x3.svg @@ -0,0 +1,2032 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The Universal Operating System + + + + + + + + + + + + + + + + + +