Merge branch 'master' of git.aims.ac.za:aims-desktop/aims-desktop-metapackages

2020.1/aims-keyring/aims-keyring-2020/debian/.gitignore

+.debhelper
+aims-keyring
+files

2020.1/aims-language-standard/aims-language-standard-2020/debian/.gitignore

+aims-language-standard
+files
+.debhelper

2020.1/aims-restricted-drivers/aims-restricted-drivers-2020/debian/.gitignore

+aims-restricted-drivers
+files
+.debhelper

2020.1/aims-restricted-extras/aims-restricted-extras-2020/debian/.gitignore

+aims-restricted-extras
+.debhelper
 aims-restricted-extras.debhelper.log
 aims-restricted-extras.substvars
 aims-restricted-extras/DEBIAN/control

2020.1/aims-utils/aims-utils-2020/debian/.gitignore

 *.debhelper.log
 *.substvars
 *.debhelper-build-stamp
+.debhelper
+files
+aims-utils
 DEBIAN/

2020.1/desktop-base/desktop-base/debian/desktop-base.postinst.debhelper

+# Automatically added by dh_icons/12.1.1
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
+	if which update-icon-caches >/dev/null 2>&1 ; then
+		update-icon-caches /usr/share/icons/desktop-base
+	fi
+fi
+# End automatically added section
+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section

2020.1/desktop-base/desktop-base/debian/desktop-base.postrm.debhelper

+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section
+# Automatically added by dh_icons/12.1.1
+if which update-icon-caches >/dev/null 2>&1 ; then
+	update-icon-caches /usr/share/icons/desktop-base
+fi
+# End automatically added section

2020.1/desktop-base/desktop-base/debian/desktop-base.preinst.debhelper

+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section

2020.1/desktop-base/desktop-base/debian/desktop-base.prerm.debhelper

+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section

2020.1/desktop-base/desktop-base/debian/desktop-base/DEBIAN/control

+Package: desktop-base
+Version: 2020.1
+Architecture: all
+Maintainer: Debian Desktop Team <debian-desktop@lists.debian.org>
+Installed-Size: 10867
+Depends: librsvg2-common, fonts-quicksand
+Recommends: plymouth-label
+Suggests: gnome | kde-standard | xfce4 | wmaker
+Section: x11
+Priority: optional
+Homepage: https://www.debian.org/devel/debian-desktop/
+Description: common files for the Debian Desktop
+ This package contains various miscellaneous files which are used by
+ Debian Desktop installations.  Currently, it provides some
+ Debian-related artwork and themes, .desktop files containing links to
+ Debian related material (suitable for placement on a user's desktop),
+ and other common files between the available desktop environments
+ such as GNOME and KDE.

2020.1/desktop-base/desktop-base/debian/desktop-base/DEBIAN/postrm

+#!/bin/sh
+set -e
+
+# Tag to allow some debhelper commands to inject relevant code
+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section
+# Automatically added by dh_icons/12.1.1
+if which update-icon-caches >/dev/null 2>&1 ; then
+	update-icon-caches /usr/share/icons/desktop-base
+fi
+# End automatically added section
+
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    if which update-grub2 > /dev/null ; then
+        update-grub2 || true
+    fi
+fi
+

2020.1/desktop-base/desktop-base/debian/desktop-base/DEBIAN/preinst

+#!/bin/sh
+set -e
+
+# Tag to allow some debhelper commands to inject relevant code
+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section
+
+
+if [ "${1}" = "upgrade" ]; then
+    if dpkg --compare-versions ${2} le "9.0.0~exp1"; then
+        # Remove alternative for desktop splash we don’t ship anymore
+        update-alternatives --remove-all desktop-splash
+
+        # Remove alternatives for themes we now ship elsewhere as a theme pack
+        ## Wallpaper
+        for background in \
+              lines-wallpaper_1280x1024.svg \
+              lines-wallpaper_1600x1200.svg \
+              lines-wallpaper_1920x1200.svg \
+              lines-wallpaper_2560x1080.svg \
+              lines-wallpaper_1920x1080.svg \
+              ; do
+            update-alternatives --remove desktop-background /usr/share/images/desktop-base/$background
+        done
+        update-alternatives --remove \
+            desktop-background.xml \
+            /usr/share/images/desktop-base/lines.xml
+        ## Login background
+        update-alternatives --remove desktop-login-background \
+            /usr/share/desktop-base/lines-theme/login-background.svg
+        update-alternatives --remove desktop-login-background \
+            /usr/share/desktop-base/lines-theme/login-background-with-logo.svg
+
+        ## Grub background
+        while read background; do
+            update-alternatives --remove \
+                desktop-grub \
+                /usr/share/images/desktop-base/$background
+        done << EOF
+lines-grub.png
+lines-grub-1920x1080.png
+EOF
+
+        # Remove alternatives for moreblue wallpapers we don’t ship anymore
+        while read background; do
+            update-alternatives --remove \
+                desktop-background \
+                /usr/share/images/desktop-base/$background
+        done << EOF
+moreblue-orbit-wallpaper.svg
+moreblue-orbit-wallpaper-widescreen.svg
+EOF
+
+        # Remove alternatives for Joy/Spacefun we now ship elsewhere as a theme
+        # pack.
+        # Wallpapers
+        while read background; do
+            update-alternatives --remove \
+                desktop-background \
+                /usr/share/images/desktop-base/$background
+        done << EOF
+joy-wallpaper_1600x1200.svg
+joy-wallpaper_1280x1024.svg
+joy-wallpaper_1920x1080.svg
+joy-wallpaper_1920x1200.svg
+joy-inksplat-wallpaper_1920x1080.svg
+spacefun-wallpaper.svg
+spacefun-wallpaper-widescreen.svg
+EOF
+        # Wallpaper XML descriptions (for GNOME)
+        while read desktopbackground; do
+            update-alternatives --remove \
+                desktop-background.xml \
+                /usr/share/images/desktop-base/$desktopbackground
+        done << EOF
+joy.xml
+EOF
+        # GRUB backgrounds
+        while read background; do
+            update-alternatives --remove \
+                desktop-grub \
+                /usr/share/images/desktop-base/$background
+        done << EOF
+joy-grub.png
+spacefun-grub.png
+spacefun-grub-widescreen.png
+EOF
+    fi
+
+    if dpkg --compare-versions ${2} eq "9.0.0~exp1"; then
+        # Remove alternatives shipped in 9.0.0~exp1 but now integrated
+        # into the theme pack system.
+        # Joy old theme structure
+        update-alternatives --remove \
+            desktop-login-background \
+            /usr/share/desktop-base/joy-theme/login-background.svg
+        # Remove login theme alternatives for theme packages
+        # because we’re dropping the secondary link for SDDM preview
+        while read theme background; do
+            update-alternatives --remove \
+                desktop-login-background \
+                /usr/share/desktop-base/$theme-theme/login/$background
+        done << EOF
+softwaves background.svg
+lines background.svg
+lines background-nologo.svg
+joy background.svg
+spacefun background.svg
+EOF
+        # *Last* remove *highest priority* alternative for active theme
+        update-alternatives --remove \
+            desktop-login-background \
+            /usr/share/desktop-base/active-theme/login/background.svg
+    fi
+
+fi

2020.1/desktop-base/desktop-base/debian/desktop-base/DEBIAN/prerm

+#!/bin/sh
+set -e
+
+# Tag to allow some debhelper commands to inject relevant code
+# Automatically added by dh_installdeb/12.1.1
+dpkg-maintscript-helper rm_conffile /etc/default/kdm.d/10_desktop-base 9.0.0\~ desktop-base -- "$@"
+# End automatically added section
+
+
+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 \
+            desktop-background \
+            /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename
+    done << EOF
+futureprototype 1920x1080.svg
+moonlight 1920x1080.svg
+softwaves 1024x768.svg
+softwaves 1280x720.svg
+softwaves 1280x800.svg
+softwaves 1280x1024.svg
+softwaves 1600x1200.svg
+softwaves 1920x1080.svg
+softwaves 1920x1200.svg
+softwaves 2560x1440.svg
+softwaves 2560x1600.svg
+lines 1280x1024.svg
+lines 1600x1200.svg
+lines 1920x1080.svg
+lines 1920x1200.svg
+lines 2560x1080.svg
+joy 1280x720.svg
+joy 1280x1024.svg
+joy 1600x1200.svg
+joy 1920x1080.svg
+joy 1920x1200.svg
+joy-inksplat 1280x720.svg
+joy-inksplat 1280x1024.svg
+joy-inksplat 1600x1200.svg
+joy-inksplat 1920x1080.svg
+joy-inksplat 1920x1200.svg
+spacefun 1280x720.svg
+spacefun 1280x1024.svg
+spacefun 1920x1080.svg
+spacefun 1920x1200.svg
+EOF
+    # *Last* remove background *highest priority* alternatives for active theme
+    update-alternatives --remove desktop-background /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
+
+    # Remove desktop-background.xml alternatives
+    # For theme packages
+    while read theme; do
+        update-alternatives --remove \
+            desktop-background.xml \
+            /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml
+    done << EOF
+futureprototype
+moonlight
+softwaves
+lines
+joy
+joy-inksplat
+spacefun
+EOF
+    # *Lastly* remove *highest priority* alternative for active theme
+    update-alternatives --remove \
+        desktop-background.xml \
+        /usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml
+
+    # Remove desktop-lockscreen.xml alternatives
+    # For theme packages
+    while read theme; do
+        update-alternatives --remove \
+            desktop-lockscreen.xml \
+            /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml
+    done << EOF
+futureprototype
+moonlight
+softwaves
+lines
+joy
+spacefun
+EOF
+    # *Last* remove *highest priority* alternative for active theme
+    update-alternatives --remove \
+        desktop-lockscreen.xml \
+        /usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml
+
+    # Remove Plasma 5/KDE wallpaper alternatives
+    # For theme packages
+    while read theme; do
+        update-alternatives --remove \
+            desktop-plasma5-wallpaper \
+            /usr/share/desktop-base/$theme-theme/wallpaper
+    done << EOF
+futureprototype
+moonlight
+softwaves
+lines
+joy
+joy-inksplat
+spacefun
+EOF
+    # *Last* remove *highest priority* alternative for active theme
+    update-alternatives --remove \
+        desktop-plasma5-wallpaper \
+        /usr/share/desktop-base/active-theme/wallpaper
+
+    # Remove login theme alternatives
+    # For theme packages
+    # Alternative for theme packages
+    while read theme background; do
+        update-alternatives --remove \
+            desktop-login-background \
+            /usr/share/desktop-base/$theme-theme/login/$background
+    done << EOF
+futureprototype background.svg
+moonlight background.svg
+softwaves background.svg
+lines background.svg
+lines background-nologo.svg
+joy background.svg
+spacefun background.svg
+EOF
+    # *Last* remove *highest priority* alternative for active theme
+    update-alternatives --remove \
+        desktop-login-background \
+        /usr/share/desktop-base/active-theme/login/background.svg
+
+    # Remove GRUB background alternatives
+    while read theme ratio; do
+        update-alternatives --remove \
+            desktop-grub \
+            /usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png
+    done << EOF
+futureprototype 4x3
+futureprototype 16x9
+moonlight 4x3
+moonlight 16x9
+softwaves 4x3
+softwaves 16x9
+lines 4x3
+lines 16x9
+joy 4x3
+joy 16x9
+spacefun 4x3
+spacefun 16x9
+EOF
+    ## *Lastly* remove *highest priority* alternative
+    num_grub_efi_installed=$(dpkg-query --list "grub-efi*" 2> /dev/null | grep "^i" | wc -l)
+    if [ $num_grub_efi_installed -gt 0 ] ; then
+        remove_first_ratio=4x3
+        remove_last_ratio=16x9
+    else
+        remove_first_ratio=16x9
+        remove_last_ratio=4x3
+    fi
+    update-alternatives --remove \
+        desktop-grub.sh \
+        /usr/share/desktop-base/active-theme/grub/grub_background.sh
+    update-alternatives --remove \
+        desktop-grub \
+        /usr/share/desktop-base/active-theme/grub/grub-$remove_first_ratio.png
+    update-alternatives --remove \
+        desktop-grub \
+        /usr/share/desktop-base/active-theme/grub/grub-$remove_last_ratio.png
+
+
+    # Remove theme package alternatives
+    while read theme; do