From 5ffbdff268245f380cbdec94f2196387e51a6974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Tue, 24 Jan 2017 17:07:44 +0000 Subject: [PATCH] Include more sizes of emblem-debian, add emblem-debian-white. (Closes: #833529) --- Makefile | 10 +- debian/changelog | 6 +- emblems-debian/Makefile | 49 +++++++ emblems-debian/emblem-debian-white.icon | 2 + emblems-debian/emblem-debian-white.svg | 127 ++++++++++++++++++ emblems-debian/emblem-debian.icon | 2 + .../emblem-debian.svg | 28 ++-- 7 files changed, 205 insertions(+), 19 deletions(-) create mode 100644 emblems-debian/Makefile create mode 100644 emblems-debian/emblem-debian-white.icon create mode 100644 emblems-debian/emblem-debian-white.svg create mode 100644 emblems-debian/emblem-debian.icon rename {icons/scalable/emblems => emblems-debian}/emblem-debian.svg (94%) diff --git a/Makefile b/Makefile index e0afab0..4c3742e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DEFAULT_BACKGROUND=desktop-background PIXMAPS=$(wildcard pixmaps/*.png) DESKTOPFILES=$(wildcard *.desktop) -all: build-grub +all: build-grub build-emblems build-grub clean-grub install-grub: @target=`echo $@ | sed s/-grub//`; \ @@ -14,9 +14,13 @@ build-grub clean-grub install-grub: fi \ done$ -clean: clean-grub +build-emblems clean-emblems install-emblems: + @target=`echo $@ | sed s/-emblems//`; \ + $(MAKE) $$target -C emblems-debian || exit 1; -install: install-grub install-local +clean: clean-grub clean-emblems + +install: install-grub install-emblems install-local install-local: # background files diff --git a/debian/changelog b/debian/changelog index 745dfd0..2f997b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ desktop-base (9.0.2) UNRELEASED; urgency=medium [ Aurélien COUDERC ] - * Include size 3840x2160 (4k) wallpaper and lockscreen (Closes: #851930). + * Include size 3840x2160 (4k) wallpaper and lockscreen. (Closes: #851930) + * Include more sizes of emblem-debian, add emblem-debian-white. + (Closes: #833529) * Lockscreen/Joy: fix wallpaper image being used instead of lockscreen. -- Aurélien COUDERC Fri, 20 Jan 2017 23:40:01 +0100 @@ -10,7 +12,7 @@ desktop-base (9.0.1) unstable; urgency=medium [ Aurélien COUDERC ] * postinst: Report success even when update-grub fails, this is needed - for installation to work inside live systems. (Closes: #850601). + for installation to work inside live systems. (Closes: #850601) * Plymouth/{softWaves,Lines,Joy}: provide fsckd progress support. Thanks to Ubuntu and Didier Roche for doing the work and providing timely info. (Closes: #850181) diff --git a/emblems-debian/Makefile b/emblems-debian/Makefile new file mode 100644 index 0000000..14eabf3 --- /dev/null +++ b/emblems-debian/Makefile @@ -0,0 +1,49 @@ +dir = usr/share/icons/hicolor +scal_emblems_dir = $(dir)/scalable/emblems + +EMBLEMS = $(basename $(wildcard *.svg)) +$(info Emblems: '$(EMBLEMS)') +RESOLUTIONS := 16 22 32 36 48 64 128 256 +$(info Resolutions: '$(RESOLUTIONS)') + +# The all target should depend on all PNGs to generate +$(info $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES).png))) +.PHONY: build +build: $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES).png)) + +# 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 > $$@ +endef +$(foreach EMBLEM,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(EMBLEM),$(RES))))) + +.PHONY: clean +clean: + rm -f *.png + +.PHONY: install +install: + install -d $(DESTDIR)/$(dir) + # Iterate over resolutions. + # For each resolution, install PNG emblems in the emblems folder for their + # resolution. + for RES in $(RESOLUTIONS) ; do \ + RES_DIR=$(DESTDIR)/$(dir)/$${RES}x$${RES} ; \ + install -d $${RES_DIR} ; \ + for EMBLEM in $(EMBLEMS) ; do \ + EMBLEMS_DIR=$${RES_DIR}/emblems ; \ + install -d $${EMBLEMS_DIR} ; \ + PNG_SOURCE=$${EMBLEM}-$${RES}x$${RES}.png ; \ + $(INSTALL) $${PNG_SOURCE} $${EMBLEMS_DIR}/$${EMBLEM}.png ; \ + $(INSTALL) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \ + done ; \ + done + for EMBLEM in $(EMBLEMS) ; do \ + EMBLEMS_DIR=$(DESTDIR)/$(scal_emblems_dir) ; \ + install -d $${EMBLEMS_DIR} ; \ + $(INSTALL) $${EMBLEM}.svg $${EMBLEMS_DIR}/ ; \ + $(INSTALL) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \ + done + +include ../Makefile.inc diff --git a/emblems-debian/emblem-debian-white.icon b/emblems-debian/emblem-debian-white.icon new file mode 100644 index 0000000..bc7e3bc --- /dev/null +++ b/emblems-debian/emblem-debian-white.icon @@ -0,0 +1,2 @@ +[Icon Data] +DisplayName=Debian White diff --git a/emblems-debian/emblem-debian-white.svg b/emblems-debian/emblem-debian-white.svg new file mode 100644 index 0000000..c6ef149 --- /dev/null +++ b/emblems-debian/emblem-debian-white.svg @@ -0,0 +1,127 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/emblems-debian/emblem-debian.icon b/emblems-debian/emblem-debian.icon new file mode 100644 index 0000000..2fbbb0a --- /dev/null +++ b/emblems-debian/emblem-debian.icon @@ -0,0 +1,2 @@ +[Icon Data] +DisplayName=Debian diff --git a/icons/scalable/emblems/emblem-debian.svg b/emblems-debian/emblem-debian.svg similarity index 94% rename from icons/scalable/emblems/emblem-debian.svg rename to emblems-debian/emblem-debian.svg index ea39f26..b8b8e0a 100644 --- a/icons/scalable/emblems/emblem-debian.svg +++ b/emblems-debian/emblem-debian.svg @@ -15,20 +15,20 @@ ns2:viewOrigin="262 450" ns2:rulerOrigin="0 0" ns2:pageBounds="0 792 612 0" - width="130" - height="130" - viewBox="0 0 130 130" + width="128" + height="128" + viewBox="0 0 128 128" overflow="visible" enable-background="new 0 0 87.041 108.445" xml:space="preserve" id="svg2" version="1.1" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="emblem-debian.svg" style="overflow:visible" inkscape:export-filename="/tmp/emblem-debian.png" - inkscape:export-xdpi="88.620003" - inkscape:export-ydpi="88.620003">