From e48a99660a71f030c7b82a54c0ff29270284ba87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Sat, 2 Feb 2019 16:12:56 +0100 Subject: [PATCH] Add logo + Debian 10 PNGs --- Makefile | 11 +- debian/control | 5 +- debian/copyright | 1 + logos/Makefile | 29 +++++ logos/debian-logo-text.svg | 234 +++++++++++++++++++++++++++++++++++++ 5 files changed, 276 insertions(+), 4 deletions(-) create mode 100644 logos/Makefile create mode 100644 logos/debian-logo-text.svg diff --git a/Makefile b/Makefile index c4ce287..3be2594 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ PIXMAPS=$(wildcard pixmaps/*.png) DESKTOPFILES=$(wildcard *.desktop) .PHONY: all clean install install-local -all: build-grub build-emblems -clean: clean-grub clean-emblems +all: build-grub build-emblems build-logos +clean: clean-grub clean-emblems clean-logos .PHONY: build-grub clean-grub install-grub build-grub clean-grub install-grub: @@ -27,8 +27,13 @@ build-emblems clean-emblems install-emblems: @target=`echo $@ | sed s/-emblems//`; \ $(MAKE) $$target -C emblems-debian || exit 1; +.PHONY: build-logos clean-logos install-logos +build-logos clean-logos install-logos: + @target=`echo $@ | sed s/-logos//`; \ + $(MAKE) $$target -C logos || exit 1; -install: install-grub install-emblems install-local + +install: install-grub install-emblems install-logos install-local install-local: # background files diff --git a/debian/control b/debian/control index 7336d5b..30d2098 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,10 @@ Uploaders: Yves-Alexis Perez , Josselin Mouette , Paul Tagliamonte , Aurélien COUDERC -Build-Depends: debhelper (>= 11), librsvg2-bin +Build-Depends: debhelper (>= 11), + librsvg2-bin, +# For the number in debian-logo-text + fonts-quicksand Rules-Requires-Root: no Standards-Version: 4.1.4 Homepage: https://www.debian.org/devel/debian-desktop/ diff --git a/debian/copyright b/debian/copyright index 02372bc..4f48db8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -72,6 +72,7 @@ Files: spacefun-theme/plymouth/logo.png futureprototype-theme/sources/plymouth/debian.svg futureprototype-theme/sources/plymouth/logo.svg moonlight-theme/plymouth/debian.png + logos/* Copyright: 1999, Software in the Public Interest, Inc. License: GPL-3+ or CC-BY-SA-3.0 diff --git a/logos/Makefile b/logos/Makefile new file mode 100644 index 0000000..a9e949a --- /dev/null +++ b/logos/Makefile @@ -0,0 +1,29 @@ +dir = usr/share/desktop-base/logos +scal_emblems_dir = $(dir)/scalable/emblems + +.PHONY: build clean install + +LOGOS = $(basename $(wildcard *.svg)) +$(info Emblems: '$(LOGOS)') +RESOLUTIONS := 64 128 256 +$(info Resolutions: '$(RESOLUTIONS)') + +# The build: target should depend on all PNGs to generate +$(info $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png))) +build: $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png)) + +# Dynamically add rules for PNG generation for each resolution, for each emblem file +define SVG_TO_PNG_RULE +$1-$2.png: $1.svg + inkscape --export-png=$$@ --export-height $2 $$< +endef +$(foreach LOGO,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(LOGO),$(RES))))) + +clean: + rm -f *.png + +install: + install -d $(DESTDIR)/$(dir) + $(INSTALL_DATA) $(wildcard *.png) $(DESTDIR)/$(dir) + +include ../Makefile.inc diff --git a/logos/debian-logo-text.svg b/logos/debian-logo-text.svg new file mode 100644 index 0000000..0d4690a --- /dev/null +++ b/logos/debian-logo-text.svg @@ -0,0 +1,234 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + + + +