diff --git a/Makefile b/Makefile
index 3be2594..b775ceb 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ build-emblems clean-emblems install-emblems:
.PHONY: build-logos clean-logos install-logos
build-logos clean-logos install-logos:
@target=`echo $@ | sed s/-logos//`; \
- $(MAKE) $$target -C logos || exit 1;
+ $(MAKE) $$target -C debian-logos || exit 1;
install: install-grub install-emblems install-logos install-local
diff --git a/logos/Makefile b/debian-logos/Makefile
similarity index 79%
rename from logos/Makefile
rename to debian-logos/Makefile
index a9e949a..2baeb6b 100644
--- a/logos/Makefile
+++ b/debian-logos/Makefile
@@ -1,10 +1,9 @@
-dir = usr/share/desktop-base/logos
-scal_emblems_dir = $(dir)/scalable/emblems
+dir = usr/share/desktop-base/debian-logos
.PHONY: build clean install
LOGOS = $(basename $(wildcard *.svg))
-$(info Emblems: '$(LOGOS)')
+$(info Logos: '$(LOGOS)')
RESOLUTIONS := 64 128 256
$(info Resolutions: '$(RESOLUTIONS)')
@@ -12,10 +11,10 @@ $(info Resolutions: '$(RESOLUTIONS)')
$(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
+# Dynamically add rules for PNG generation for each resolution, for each logo file
define SVG_TO_PNG_RULE
$1-$2.png: $1.svg
- inkscape --export-png=$$@ --export-height $2 $$<
+ rsvg-convert $$< -h $2 -o $$@
endef
$(foreach LOGO,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(LOGO),$(RES)))))
@@ -24,6 +23,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
+ $(INSTALL_DATA) $(wildcard *.svg) $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.png) $(DESTDIR)/$(dir)
include ../Makefile.inc
diff --git a/debian-logos/logo-text-version.svg b/debian-logos/logo-text-version.svg
new file mode 100644
index 0000000..23a9841
--- /dev/null
+++ b/debian-logos/logo-text-version.svg
@@ -0,0 +1,221 @@
+
+
+
+
diff --git a/logos/debian-logo-text.svg b/debian-logos/logo-text.svg
similarity index 57%
rename from logos/debian-logo-text.svg
rename to debian-logos/logo-text.svg
index 0d4690a..f97c19a 100644
--- a/logos/debian-logo-text.svg
+++ b/debian-logos/logo-text.svg
@@ -10,13 +10,13 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="180.46503mm"
+ width="156.32251mm"
height="53.551666mm"
- viewBox="0 0 180.46502 53.551666"
+ viewBox="0 0 156.3225 53.551666"
version="1.1"
id="svg901"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
- sodipodi:docname="debian-logo-text.svg">
+ sodipodi:docname="logo-text.svg">
+ id="g1014">
+ transform="matrix(0.98926092,0,0,0.98926092,54.110223,140.5767)"
+ id="g1021"
+ style="overflow:visible;stroke-width:0.26745555">
+ style="stroke-width:0.26745555"
+ id="Layer_1"
+ ns2:layer="yes"
+ ns2:dimmedPercent="50"
+ ns2:rgbTrio="#4F008000FFFF">
-
-
-
-
-
-
-
-
-
+ style="stroke-width:0.26745555"
+ id="g991">
+
+
+
+
+
+
+
-
- 10
diff --git a/debian-logos/logo.svg b/debian-logos/logo.svg
new file mode 100644
index 0000000..b644f17
--- /dev/null
+++ b/debian-logos/logo.svg
@@ -0,0 +1,122 @@
+
+
+
+
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
index e269b76..be13343 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -16,6 +16,12 @@ if [ "${1}" = "configure" ] && [ ! -z "${2}" ]; then
fi
fi
+# Vendor logo alternative
+update-alternatives --install \
+ /usr/share/images/vendor-logos \
+ vendor-logos \
+ /usr/share/desktop-base/debian-logos 50
+
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
# Theme package alternatives
while read theme priority; do
diff --git a/debian/prerm b/debian/prerm
index 1c7f581..905ab37 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -4,6 +4,10 @@ set -e
# Tag to allow some debhelper commands to inject relevant code
#DEBHELPER#
+update-alternatives --remove \
+ vendor-logos \
+ /usr/share/desktop-base/debian-logos
+
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
# Remove background alternatives for theme packages
while read theme filename; do