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

a56d3055 · Jan Groenewald · 8c62ed4b · 79463750 · a56d3055 · a56d3055
Commit a56d3055 authored Jul 03, 2019 by Jan Groenewald
--- a/2020.1/aims-keyring/aims-keyring-2020/debian/.gitignore
+++ b/2020.1/aims-keyring/aims-keyring-2020/debian/.gitignore
+.debhelper
+aims-keyring
+files
--- a/2020.1/aims-language-standard/aims-language-standard-2020/debian/.gitignore
+++ b/2020.1/aims-language-standard/aims-language-standard-2020/debian/.gitignore
+aims-language-standard
+files
+.debhelper
--- a/2020.1/aims-restricted-drivers/aims-restricted-drivers-2020/debian/.gitignore
+++ b/2020.1/aims-restricted-drivers/aims-restricted-drivers-2020/debian/.gitignore
+aims-restricted-drivers
+files
+.debhelper
--- a/2020.1/aims-restricted-extras/aims-restricted-extras-2020/debian/.gitignore
+++ b/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

--- a/2020.1/aims-utils/aims-utils-2020/debian/.gitignore
+++ b/2020.1/aims-utils/aims-utils-2020/debian/.gitignore
 *.debhelper.log
 *.substvars
 *.debhelper-build-stamp
+.debhelper
+files
+aims-utils
 DEBIAN/
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-128.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-128.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-128.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-128.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-256.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-256.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-256.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-256.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-64.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-64.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-64.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-64.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-128.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-128.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-128.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-128.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-256.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-256.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-256.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-256.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-64.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-64.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-64.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-64.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-version-128.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-version-128.png
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-version-128.png.raw
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-version-128.png.raw
--- a/2020.1/desktop-base/desktop-base/debian-logos/logo-text-version-256.png
+++ b/2020.1/desktop-base/desktop-base/debian-logos/logo-text-version-256.png