Add vendor emblems/icons (here Debian) and the corresponding alternatives so derivates can propose their own (Closes: #898456)

4 files changed, 118 insertions, 16 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index ae97221..6737081 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,6 +4,8 @@ README for desktop-base
 1. What’s provided
    1.1. Themes packs
    1.2. Debian logos
+      1.2.1. Debian logos icons
+      1.2.2. Debian logos images
    1.3. Desktop files
    1.4. Default configurations overrides
    1.5. Plymouth boot splashes
@@ -35,12 +37,68 @@ theme packs structure.
 
 1.2. Debian logos
 
-Several sizes of the Debian logo are shipped as:
-    /usr/share/icons/hicolor/${size}x${size}/emblems/emblem-debian.${ext}
-    /usr/share/icons/hicolor/${size}x${size}/emblems/emblem-debian.icon
-
-    The sizes currently provided are 36, 64, 128 as PNG, and scalable for the
-SVG version. Each has a side .icon descriptor file.
+Three version of the logo are shipped as icons:
+- emblem-debian         : the Debian logo in it’s original red-purple color
+- emblem-debian-symbolic: the Debian logo in a black+transparent format that
+                          desktop like GNOME can use and adapt the color
+                          depending on the context.
+- emblem-debian-white   : the Debian logo in white
+
+We also ship 3 versions of the logo as images:
+- logo             : logo alone
+- logo-text        : logo + "Debian" name
+- logo-text-version: logo + "Debian" name + Debian version number
+
+All these images and logos are provided both in several bitmap resolutions
+(PNG) and also in vector form (SVG).
+
+The "vendor-logos" alternative is shipped with alternatives for both
+logo images and icons.
+It should be used by derivatives to replace by their own logos.
+
+The alternative has the following structure:
+- Main alternative
+    /usr/share/images/vendor-logos -> /etc/alternatives/vendor-logos
+- Secondary alternatives
+    /usr/share/icons/vendor/128x128/emblems:
+        emblem-vendor.png -> /etc/alternatives/emblem-vendor-128
+        emblem-vendor-symbolic.png -> /etc/alternatives/emblem-vendor-symbolic-128
+        emblem-vendor-white.png -> /etc/alternatives/emblem-vendor-white-128
+    /usr/share/icons/vendor/256x256/emblems:
+        emblem-vendor.png -> /etc/alternatives/emblem-vendor-256
+        emblem-vendor-symbolic.png -> /etc/alternatives/emblem-vendor-symbolic-256
+        emblem-vendor-white.png -> /etc/alternatives/emblem-vendor-white-256
+    /usr/share/icons/vendor/64x64/emblems:
+        emblem-vendor.png -> /etc/alternatives/emblem-vendor-64
+        emblem-vendor-symbolic.png -> /etc/alternatives/emblem-vendor-symbolic-64
+        emblem-vendor-white.png -> /etc/alternatives/emblem-vendor-white-64
+    /usr/share/icons/vendor/scalable/emblems:
+        emblem-vendor.svg -> /etc/alternatives/emblem-vendor-scalable
+        emblem-vendor-symbolic.svg -> /etc/alternatives/emblem-vendor-symbolic-scalable
+        emblem-vendor-white.svg -> /etc/alternatives/emblem-vendor-white-scalable
+
+1.2.1. Debian logos icons
+
+Several sizes of logo icons are shipped:
+    64, 128, 256 and scalable (svg)
+They can be found in:
+    /usr/share/icons/desktop-base/${size}x${size}/emblems/${emblem}.png
+    /usr/share/icons/desktop-base/emblems/${emblem}.svg
+
+[Legacy]
+Several sizes of legacy logo icons are shipped:
+    16, 22, 32, 36, 48, 64, 128, 256 and scalable (svg)
+They can be found in:
+    /usr/share/icons/hicolor/${size}x${size}/emblems/${emblem}.png
+    /usr/share/icons/hicolor/${size}x${size}/emblems/${emblem}.icon
+    /usr/share/icons/hicolor/scalable/emblems/${emblem}.svg
+    /usr/share/icons/hicolor/scalable/emblems/${emblem}.icon
+These will be removed after buster.
+
+1.2.2. Debian logos images
+
+The Debian logo images are shipped in:
+    /usr/share/desktop-base/debian-logos/
 
 A Debian security logo is also shipped in:
     /usr/share/pixmaps/debian-security.png
diff --git a/debian/desktop-base.lintian-overrides b/debian/desktop-base.lintian-overrides
new file mode 100644
index 0000000..57a8950
--- /dev/null
+++ b/debian/desktop-base.lintian-overrides
@@ -0,0 +1,7 @@
+# The following folders are created in order to point alternatives to them.
+# They filled by update-alternatives in postinst during installation.
+desktop-base binary: package-contains-empty-directory usr/share/icons/vendor/128x128/emblems/
+desktop-base binary: package-contains-empty-directory usr/share/icons/vendor/256x256/emblems/
+desktop-base binary: package-contains-empty-directory usr/share/icons/vendor/64x64/emblems/
+desktop-base binary: package-contains-empty-directory usr/share/icons/vendor/scalable/emblems/
+
diff --git a/debian/postinst b/debian/postinst
index be13343..5b0c244 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -16,13 +16,49 @@ 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
+    # Vendor logo alternative
+    update-alternatives --install \
+            /usr/share/images/vendor-logos \
+            vendor-logos \
+            /usr/share/desktop-base/debian-logos 50 \
+            --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor.png \
+                emblem-vendor-64 \
+                /usr/share/icons/desktop-base/64x64/emblems/emblem-debian.png \
+            --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor.png \
+                emblem-vendor-128 \
+                /usr/share/icons/desktop-base/128x128/emblems/emblem-debian.png \
+            --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png \
+                emblem-vendor-256 \
+                /usr/share/icons/desktop-base/256x256/emblems/emblem-debian.png \
+            --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg \
+                emblem-vendor-scalable \
+                /usr/share/icons/desktop-base/scalable/emblems/emblem-debian.svg \
+            --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor-symbolic.png \
+                emblem-vendor-symbolic-64 \
+                /usr/share/icons/desktop-base/64x64/emblems/emblem-debian-symbolic.png \
+            --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor-symbolic.png \
+                emblem-vendor-symbolic-128 \
+                /usr/share/icons/desktop-base/128x128/emblems/emblem-debian-symbolic.png \
+            --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor-symbolic.png \
+                emblem-vendor-symbolic-256 \
+                /usr/share/icons/desktop-base/256x256/emblems/emblem-debian-symbolic.png \
+            --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor-symbolic.svg \
+                emblem-vendor-symbolic-scalable \
+                /usr/share/icons/desktop-base/scalable/emblems/emblem-debian-symbolic.svg \
+            --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor-white.png \
+                emblem-vendor-white-64 \
+                /usr/share/icons/desktop-base/64x64/emblems/emblem-debian-white.png \
+            --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor-white.png \
+                emblem-vendor-white-128 \
+                /usr/share/icons/desktop-base/128x128/emblems/emblem-debian-white.png \
+            --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor-white.png \
+                emblem-vendor-white-256 \
+                /usr/share/icons/desktop-base/256x256/emblems/emblem-debian-white.png \
+            --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor-white.svg \
+                emblem-vendor-white-scalable \
+                /usr/share/icons/desktop-base/scalable/emblems/emblem-debian-white.svg
+
     # Theme package alternatives
     while read theme priority; do
         update-alternatives --install \
diff --git a/debian/prerm b/debian/prerm
index 905ab37..2e571be 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -4,11 +4,12 @@ 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 vendor logos alternative, all slaves get removed automatically
+    update-alternatives --remove \
+            vendor-logos \
+            /usr/share/desktop-base/debian-logos
+
     # Remove background alternatives for theme packages
     while read theme filename; do
         update-alternatives --remove \