diff --git a/debian-logos/Makefile b/debian-logos/Makefile index 2baeb6b..197faab 100644 --- a/debian-logos/Makefile +++ b/debian-logos/Makefile @@ -14,11 +14,13 @@ build: $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png)) # Dynamically add rules for PNG generation for each resolution, for each logo file define SVG_TO_PNG_RULE $1-$2.png: $1.svg - rsvg-convert $$< -h $2 -o $$@ + rsvg-convert $$< -h $2 -o $$@.raw + optipng $$@.raw -out $$@ endef $(foreach LOGO,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(LOGO),$(RES))))) clean: + rm -f *.png.raw rm -f *.png install: diff --git a/debian/control b/debian/control index 30d2098..2944ff0 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Uploaders: Yves-Alexis Perez , Aurélien COUDERC Build-Depends: debhelper (>= 11), librsvg2-bin, + optipng, # For the number in debian-logo-text fonts-quicksand Rules-Requires-Root: no diff --git a/emblems-debian/Makefile b/emblems-debian/Makefile index 4638380..520c5c7 100644 --- a/emblems-debian/Makefile +++ b/emblems-debian/Makefile @@ -23,11 +23,13 @@ build: $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES # Dynamically add rules for PNG generation for each resolution, for each emblem file define SVG_TO_PNG_RULE $1-$2x$2.png: $1.svg - rsvg-convert $$< -w $2 -h $2 -o $$@ + rsvg-convert $$< -w $2 -h $2 -o $$@.raw + optipng $$@.raw -out $$@ endef $(foreach EMBLEM,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(EMBLEM),$(RES))))) clean: + rm -f *.png.raw rm -f *.png install: diff --git a/futureprototype-theme/grub/Makefile b/futureprototype-theme/grub/Makefile index b791e4c..71d83cc 100644 --- a/futureprototype-theme/grub/Makefile +++ b/futureprototype-theme/grub/Makefile @@ -9,6 +9,7 @@ files = \ build: $(files) clean: + rm -f grub-4x3.png.raw grub-16x9.png.raw rm -f grub-4x3.png grub-16x9.png install: @@ -16,9 +17,11 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ include ../../Makefile.inc diff --git a/futureprototype-theme/plymouth/debian.png b/futureprototype-theme/plymouth/debian.png index 2e651f8..e7a9768 100644 Binary files a/futureprototype-theme/plymouth/debian.png and b/futureprototype-theme/plymouth/debian.png differ diff --git a/futureprototype-theme/plymouth/logo.png b/futureprototype-theme/plymouth/logo.png index de145d5..eb9f456 100644 Binary files a/futureprototype-theme/plymouth/logo.png and b/futureprototype-theme/plymouth/logo.png differ diff --git a/futureprototype-theme/plymouth/logo_circle.png b/futureprototype-theme/plymouth/logo_circle.png index ce89052..ed3bf4b 100644 Binary files a/futureprototype-theme/plymouth/logo_circle.png and b/futureprototype-theme/plymouth/logo_circle.png differ diff --git a/futureprototype-theme/plymouth/password_dot.png b/futureprototype-theme/plymouth/password_dot.png index 80d16f4..f1103d1 100644 Binary files a/futureprototype-theme/plymouth/password_dot.png and b/futureprototype-theme/plymouth/password_dot.png differ diff --git a/futureprototype-theme/plymouth/plymouth_background_future.png b/futureprototype-theme/plymouth/plymouth_background_future.png index 80ed833..55440e4 100644 Binary files a/futureprototype-theme/plymouth/plymouth_background_future.png and b/futureprototype-theme/plymouth/plymouth_background_future.png differ diff --git a/joy-theme/grub/Makefile b/joy-theme/grub/Makefile index af95335..fd9cb25 100644 --- a/joy-theme/grub/Makefile +++ b/joy-theme/grub/Makefile @@ -9,6 +9,7 @@ files = \ build: $(files) clean: + rm -f grub-4x3.png.raw grub-16x9.png.raw rm -f grub-4x3.png grub-16x9.png install: @@ -16,9 +17,11 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ include ../../Makefile.inc diff --git a/joy-theme/plymouth/background.png b/joy-theme/plymouth/background.png index 6c5bc58..027ff75 100644 Binary files a/joy-theme/plymouth/background.png and b/joy-theme/plymouth/background.png differ diff --git a/joy-theme/plymouth/debian_logo.png b/joy-theme/plymouth/debian_logo.png index 72acd04..1310247 100644 Binary files a/joy-theme/plymouth/debian_logo.png and b/joy-theme/plymouth/debian_logo.png differ diff --git a/joy-theme/plymouth/debian_logo16.png b/joy-theme/plymouth/debian_logo16.png index 572b08d..a9721cf 100644 Binary files a/joy-theme/plymouth/debian_logo16.png and b/joy-theme/plymouth/debian_logo16.png differ diff --git a/joy-theme/plymouth/password_dot.png b/joy-theme/plymouth/password_dot.png index 7dd7413..7436dba 100644 Binary files a/joy-theme/plymouth/password_dot.png and b/joy-theme/plymouth/password_dot.png differ diff --git a/joy-theme/plymouth/password_field.png b/joy-theme/plymouth/password_field.png index 4c0b93e..34f448a 100644 Binary files a/joy-theme/plymouth/password_field.png and b/joy-theme/plymouth/password_field.png differ diff --git a/joy-theme/plymouth/progress_dot_off.png b/joy-theme/plymouth/progress_dot_off.png index fa06637..a7699f1 100644 Binary files a/joy-theme/plymouth/progress_dot_off.png and b/joy-theme/plymouth/progress_dot_off.png differ diff --git a/joy-theme/plymouth/progress_dot_on.png b/joy-theme/plymouth/progress_dot_on.png index 59c1d05..ed376c9 100644 Binary files a/joy-theme/plymouth/progress_dot_on.png and b/joy-theme/plymouth/progress_dot_on.png differ diff --git a/joy-theme/plymouth/progress_dot_on16.png b/joy-theme/plymouth/progress_dot_on16.png index 6489b6c..535a0d1 100644 Binary files a/joy-theme/plymouth/progress_dot_on16.png and b/joy-theme/plymouth/progress_dot_on16.png differ diff --git a/lines-theme/grub/Makefile b/lines-theme/grub/Makefile index 9b0f649..d3379ab 100644 --- a/lines-theme/grub/Makefile +++ b/lines-theme/grub/Makefile @@ -9,6 +9,7 @@ files = \ build: $(files) clean: + rm -f grub-4x3.png.raw grub-16x9.png.raw rm -f grub-4x3.png grub-16x9.png install: @@ -16,9 +17,11 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ include ../../Makefile.inc diff --git a/lines-theme/plymouth/background.png b/lines-theme/plymouth/background.png index b8e6561..00da42a 100644 Binary files a/lines-theme/plymouth/background.png and b/lines-theme/plymouth/background.png differ diff --git a/lines-theme/plymouth/debian.png b/lines-theme/plymouth/debian.png index 35e3608..bb2140a 100644 Binary files a/lines-theme/plymouth/debian.png and b/lines-theme/plymouth/debian.png differ diff --git a/lines-theme/plymouth/electron.png b/lines-theme/plymouth/electron.png index ab1ef02..d02edef 100644 Binary files a/lines-theme/plymouth/electron.png and b/lines-theme/plymouth/electron.png differ diff --git a/lines-theme/plymouth/logo.png b/lines-theme/plymouth/logo.png index fca91be..853ba51 100644 Binary files a/lines-theme/plymouth/logo.png and b/lines-theme/plymouth/logo.png differ diff --git a/lines-theme/plymouth/password_dot.png b/lines-theme/plymouth/password_dot.png index 7dd7413..7436dba 100644 Binary files a/lines-theme/plymouth/password_dot.png and b/lines-theme/plymouth/password_dot.png differ diff --git a/lines-theme/plymouth/password_field.png b/lines-theme/plymouth/password_field.png index 4c0b93e..34f448a 100644 Binary files a/lines-theme/plymouth/password_field.png and b/lines-theme/plymouth/password_field.png differ diff --git a/moonlight-theme/grub/Makefile b/moonlight-theme/grub/Makefile index 69931ff..5090e00 100644 --- a/moonlight-theme/grub/Makefile +++ b/moonlight-theme/grub/Makefile @@ -9,6 +9,7 @@ files = \ build: $(files) clean: + rm -f grub-4x3.png.raw grub-16x9.png.raw rm -f grub-4x3.png grub-16x9.png install: @@ -16,9 +17,11 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ include ../../Makefile.inc diff --git a/moonlight-theme/plymouth/background.png b/moonlight-theme/plymouth/background.png index 83151dd..823e732 100644 Binary files a/moonlight-theme/plymouth/background.png and b/moonlight-theme/plymouth/background.png differ diff --git a/moonlight-theme/plymouth/debian.png b/moonlight-theme/plymouth/debian.png index a967325..99314c0 100644 Binary files a/moonlight-theme/plymouth/debian.png and b/moonlight-theme/plymouth/debian.png differ diff --git a/moonlight-theme/plymouth/glow.png b/moonlight-theme/plymouth/glow.png index 1c351bc..c82982e 100644 Binary files a/moonlight-theme/plymouth/glow.png and b/moonlight-theme/plymouth/glow.png differ diff --git a/moonlight-theme/plymouth/logo_in_circle.png b/moonlight-theme/plymouth/logo_in_circle.png index 0eb93c7..6f7b7ec 100644 Binary files a/moonlight-theme/plymouth/logo_in_circle.png and b/moonlight-theme/plymouth/logo_in_circle.png differ diff --git a/moonlight-theme/plymouth/password_dot.png b/moonlight-theme/plymouth/password_dot.png index 3e429db..f7e1b2d 100644 Binary files a/moonlight-theme/plymouth/password_dot.png and b/moonlight-theme/plymouth/password_dot.png differ diff --git a/moonlight-theme/plymouth/password_field.png b/moonlight-theme/plymouth/password_field.png index c23f5b8..38ef38f 100644 Binary files a/moonlight-theme/plymouth/password_field.png and b/moonlight-theme/plymouth/password_field.png differ diff --git a/moonlight-theme/plymouth/support.png b/moonlight-theme/plymouth/support.png index 5705987..23fb021 100644 Binary files a/moonlight-theme/plymouth/support.png and b/moonlight-theme/plymouth/support.png differ diff --git a/pixmaps/debian-security.png b/pixmaps/debian-security.png index e5696b0..25873c8 100644 Binary files a/pixmaps/debian-security.png and b/pixmaps/debian-security.png differ diff --git a/softwaves-theme/grub/Makefile b/softwaves-theme/grub/Makefile index 02b9ff4..540249f 100644 --- a/softwaves-theme/grub/Makefile +++ b/softwaves-theme/grub/Makefile @@ -9,6 +9,7 @@ files = \ build: $(files) clean: + rm -f grub-4x3.png.raw grub-16x9.png.raw rm -f grub-4x3.png grub-16x9.png install: @@ -16,9 +17,11 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ include ../../Makefile.inc diff --git a/softwaves-theme/plymouth/debian.png b/softwaves-theme/plymouth/debian.png index 00c05ee..5caaa95 100644 Binary files a/softwaves-theme/plymouth/debian.png and b/softwaves-theme/plymouth/debian.png differ diff --git a/softwaves-theme/plymouth/logo.png b/softwaves-theme/plymouth/logo.png index 1d44561..27eb7bd 100644 Binary files a/softwaves-theme/plymouth/logo.png and b/softwaves-theme/plymouth/logo.png differ diff --git a/softwaves-theme/plymouth/logo_circle.png b/softwaves-theme/plymouth/logo_circle.png index ce89052..ed3bf4b 100644 Binary files a/softwaves-theme/plymouth/logo_circle.png and b/softwaves-theme/plymouth/logo_circle.png differ diff --git a/softwaves-theme/plymouth/password_dot.png b/softwaves-theme/plymouth/password_dot.png index 3e429db..f7e1b2d 100644 Binary files a/softwaves-theme/plymouth/password_dot.png and b/softwaves-theme/plymouth/password_dot.png differ diff --git a/softwaves-theme/plymouth/password_field.png b/softwaves-theme/plymouth/password_field.png index c23f5b8..38ef38f 100644 Binary files a/softwaves-theme/plymouth/password_field.png and b/softwaves-theme/plymouth/password_field.png differ diff --git a/softwaves-theme/plymouth/plymouth_background_waves.png b/softwaves-theme/plymouth/plymouth_background_waves.png index c948bd8..e8b0eaa 100644 Binary files a/softwaves-theme/plymouth/plymouth_background_waves.png and b/softwaves-theme/plymouth/plymouth_background_waves.png differ diff --git a/spacefun-theme/grub/Makefile b/spacefun-theme/grub/Makefile index 18c0386..4f00886 100644 --- a/spacefun-theme/grub/Makefile +++ b/spacefun-theme/grub/Makefile @@ -9,6 +9,7 @@ files = \ build: $(files) clean: + rm -f grub-4x3.png.raw grub-16x9.png.raw rm -f grub-4x3.png grub-16x9.png install: @@ -16,9 +17,11 @@ install: $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir) grub-4x3.png: grub-4x3.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ grub-16x9.png: grub-16x9.svg - rsvg-convert $< -o $@ + rsvg-convert $< -o $@.raw + optipng $@.raw -out $@ include ../../Makefile.inc