diff --git a/Makefile b/Makefile index c056c00..277522a 100644 --- a/Makefile +++ b/Makefile @@ -299,10 +299,6 @@ install-local: install -d $(DESTDIR)/usr/share/desktop-base/emerald-theme/login $(INSTALL_DATA) $(wildcard emerald-theme/login/*) $(DESTDIR)/usr/share/desktop-base/emerald-theme/login - ### Login background - install -d $(DESTDIR)/usr/share/desktop-base/emerald-theme/grub - $(INSTALL_DATA) $(wildcard emerald-theme/grub/*) $(DESTDIR)/usr/share/desktop-base/emerald-theme/grub - ### Lockscreen is using the same image as wallpaper install -d $(DESTDIR)/usr/share/desktop-base/emerald-theme/lockscreen/contents/images $(INSTALL_DATA) emerald-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/emerald-theme/lockscreen diff --git a/debian/changelog b/debian/changelog index 9c072f1..ce1b186 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ desktop-base (12.0.3) UNRELEASED; urgency=medium * Update plymouth theme to implement Juliette’s proposal. * Fix and improve Plasma desktop customization. (Closes: #954093) * Update logos to Debian version 12. (Closes: #1026464) + * Improve grub theme. (Closes: #1027301) -- Aurélien COUDERC Fri, 10 Feb 2023 23:38:10 +0100 diff --git a/debian/control b/debian/control index be3e360..714e4c4 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Yves-Alexis Perez , Aurélien COUDERC , Jonathan Carter Build-Depends: debhelper (>= 13), + inkscape, librsvg2-bin, optipng, # For the number in debian-logo-text diff --git a/emerald-theme/grub/Makefile b/emerald-theme/grub/Makefile index 169abbd..f4856de 100644 --- a/emerald-theme/grub/Makefile +++ b/emerald-theme/grub/Makefile @@ -1,4 +1,4 @@ -dir = usr/share/desktop-base/homeworld-theme/grub +dir = usr/share/desktop-base/emerald-theme/grub .PHONY: build clean install @@ -17,11 +17,13 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@.raw + inkscape --export-filename=$@ $< + mv $@ $@.raw optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@.raw + inkscape --export-filename=$@ $< + mv $@ $@.raw optipng $@.raw -out $@ include ../../Makefile.inc diff --git a/emerald-theme/grub/grub-16x9.svg b/emerald-theme/grub/grub-16x9.svg index 8717d74..0d1eb81 100644 --- a/emerald-theme/grub/grub-16x9.svg +++ b/emerald-theme/grub/grub-16x9.svg @@ -7,782 +7,922 @@ x="0px" y="0px" viewBox="0 0 1920 1080" - style="enable-background:new 0 0 1920 1080;" xml:space="preserve" - sodipodi:docname="Emerald_wallpaper_without_logo.svg" - inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="grub-16x9.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + width="1920" + height="1080" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - + id="defs299"> + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + inkscape:current-layer="Calque_1" /> - + - - - - + + + - - - - - + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - + + + + + + + + - + - + - - - - - - + id="stop167" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/emerald-theme/grub/grub-4x3.svg b/emerald-theme/grub/grub-4x3.svg index 3b8518b..a2449dc 100644 --- a/emerald-theme/grub/grub-4x3.svg +++ b/emerald-theme/grub/grub-4x3.svg @@ -1,8 +1,86 @@ - + - -