Buster related fixes

2017.1/aims-restricted-drivers-2017/debian/aims-restricted-drivers/DEBIAN/md5sums

-091fe58af26e86880e96c920e9cd2fde  usr/share/doc/aims-restricted-drivers/changelog.gz
-c4824b4da81b4da8b34f0176467d2478  usr/share/doc/aims-restricted-drivers/copyright

2017.1/aims-restricted-drivers-2017/debian/changelog

+aims-restricted-drivers (2020.1) buster; urgency=medium
+
+  * Update compat to level 11
+  * Update standards version to 4.2.1
+  * Set priority to 'optional'
+  * Update homepage
+  * Add vcs-browser field
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 28 Sep 2018 11:00:27 +0200
+
 aims-restricted-drivers (2017.04.2) stretch; urgency=medium
 
   * Add firmware-atheros

2017.1/aims-restricted-drivers-2017/debian/compat

-10
+11

2017.1/aims-restricted-drivers-2017/debian/control

 Source: aims-restricted-drivers
 Section: non-free/kernel
-Priority: extra
-Maintainer: Jonathan Carter <jcarter@linux.com>
-Build-Depends: debhelper (>= 10)
-Standards-Version: 3.9.8
-Homepage: http://help.aims.ac.za
+Priority: optional
+Maintainer: Jonathan Carter <jonathan@aims.ac.za>
+            Jan Groenewald <jan@aims.ac.za>
+Build-Depends: debhelper (>= 11)
+Standards-Version: 4.2.1 
+Homepage: https://desktop.aims.ac.za
+Vcs-browser: https://git.aims.ac.za/aims-desktop/aims-desktop-metapackages
 
 Package: aims-restricted-drivers
 Architecture: all

2020.1/aims-artwork/aims-artwork-2020/debian/copyright

-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: aims-artwork
-Source: <url://example.com>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: aims-desktop-metapackages
+Source: https://git.aims.ac.za/aims-desktop/aims-desktop-metapackages
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
-
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2016 Jonathan Carter <jonathan@jonathan-desktop
->
+Copyright: 2016-2018 African Institute for Mathematical Sciences
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -32,8 +20,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

2020.1/aims-desktop/aims-desktop-2020/debian/changelog

-aims-desktop (2020.01) buster; urgency=medium
+aims-desktop (2020.2) buster; urgency=medium
+
+  * Update path to install dash-to-dock schema overrides
+  * Use xorg by default instead of wayland 
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 01 Oct 2018 11:33:02 +0200
+
+aims-desktop (2020.1) buster; urgency=medium
 
   * Update compat to level 11
   * Update standards version to 4.2.1 

2020.1/aims-desktop/aims-desktop-2020/debian/install

@@ -8,8 +8,8 @@ bin/aims-install-r35 usr/sbin
 bin/aims-install-restricted-extras usr/sbin
 bin/aims-install-rstudio usr/sbin
 conf/gsettings/10_com.gexperts.Terminix.gschema.override usr/share/glib-2.0/schemas
-conf/gsettings/95_aims-desktop.gschema.override  usr/share/glib-2.0/schemas
-conf/gsettings/95_dashtodock.gschema.override  usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/schemas
+conf/gsettings/95_aims-desktop.gschema.override usr/share/glib-2.0/schemas
+conf/gsettings/95_dashtodock.gschema.override usr/share/glib-2.0/schemas
 conf/mimetypes/mimeapps.list etc/xdg
 conf/xterm/XTerm.QVT /etc/X11/app-defaults
 gnome-term.png usr/share/pixmaps

2020.1/aims-desktop/aims-desktop-2020/debian/postinst

@@ -8,3 +8,12 @@ update-mime-database /usr/share/mime
 # For Su Finance system keybindings
 [ -e /etc/X11/app-defaults/XTerm.orig ] || \
 (cp /etc/X11/app-defaults/XTerm /etc/X11/app-defaults/XTerm.orig && cat /etc/X11/app-defaults/XTerm.QVT >> /etc/X11/app-defaults/XTerm)
+
+# We play it very conservative, if this file doessn't exist at all,
+# we write it.
+if [ ! -f /etc/gdm3/custom.conf ]; then
+    echo "# On AIMS Desktop systems, set this to true if you want Wayland" \
+	 > /etc/gdm3/custom.conf
+    echo "[daemon]" >> /etc/gdm3/custom.conf
+    echo "WaylandEnable=false" >> /etc/gdm3/custom.conf
+fi

2020.1/aims-fonts/aims-fonts-2020/debian/aims-fonts/DEBIAN/control

+Package: aims-fonts
+Version: 2020.2
+Architecture: all
+Maintainer: Jonathan Carter <jonathan@aims.ac.za>
+            Jan Groenewald <jan@aims.ac.za>
+Installed-Size: 9
+Recommends: fonts-beteckna, fonts-bpg-georgian, fonts-breip, fonts-century-catalogue, fonts-crosextra-caladea, fonts-crosextra-carlito, fonts-dkg-handwriting, fonts-dustin, fonts-ecolier-court, fonts-ecolier-lignes-court, fonts-inconsolata, fonts-junicode, fonts-levien-museum, fonts-levien-typoscript, fonts-liberation, fonts-linex, fonts-linuxlibertine, fonts-mgopen, fonts-oflb-asana-math, fonts-oflb-euterpe, fonts-okolaks, fonts-opendin, fonts-sil-andika, fonts-sil-gentium, fonts-ubuntu-font-family-console, otf-freefont, ttf-adf-accanthis, ttf-adf-baskervald, ttf-adf-berenis, ttf-adf-gillius, ttf-adf-ikarius, ttf-adf-irianis, ttf-adf-libris, ttf-adf-mekanus, ttf-adf-oldania, ttf-adf-romande, ttf-adf-switzera, ttf-adf-tribun, ttf-adf-universalis, ttf-adf-verana, ttf-aenigma, ttf-ancient-fonts, ttf-atarismall, ttf-engadget, ttf-essays1743, ttf-femkeklaver, ttf-georgewilliams, ttf-goudybookletter, ttf-isabella, ttf-marvosym, ttf-radisnoir, ttf-sjfonts, ttf-staypuft, ttf-ubuntu-font-family
+Section: utils
+Priority: optional
+Homepage: https://desktop.aims.ac.za
+Description: Collection of useful fonts from Ubuntu archive
+ Metapackage that depends on a collection of useful fonts:
+  - fonts-liberation - collection of fonts metrically compatible
+                       with popular Microsoft fonts
+  - fonts-crosextra-carlito - metrically compatible with MS Calibri font
+  - fonts-crosextra-caladea - metrically compatible with MS Cambria font
+  - ... and many more (see package recommends field for details)

2020.1/aims-fonts/aims-fonts-2020/debian/aims-fonts/DEBIAN/md5sums

+9f67b3e162bb1d22935c367681846676  usr/share/doc/aims-fonts/changelog.gz
+5ff95f5b95b13f14a79df2c108027b7b  usr/share/doc/aims-fonts/copyright

2017.1/aims-restricted-drivers-2017/debian/aims-restricted-drivers/usr/share/doc/aims-restricted-drivers/copyright → 2020.1/aims-fonts/aims-fonts-2020/debian/aims-fonts/usr/share/doc/aims-fonts/copyright

-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: aims-restricted-drivers
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: aims-desktop-metapackages
+Source: https://git.aims.ac.za/aims-desktop/aims-desktop-metapackages
 
-Files: debian/*
-Copyright: 2016 Jonathan Carter <jcarter@linux.com>
+Files: *
+Copyright: 2016-2018 African Institute for Mathematical Sciences
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

2020.1/aims-fonts/aims-fonts-2020/debian/changelog

+aims-fonts (2020.2) buster; urgency=medium
+
+  * Remove rufscript font, doesn't currently install on buster 
+
+ -- Jonathan Carter <jonathan@aims.ac.za>  Fri, 28 Sep 2018 11:53:07 +0200
+
 aims-fonts (2020.1) buster; urgency=medium
 
   * Update compat to level 11 

2020.1/aims-fonts/aims-fonts-2020/debian/control

@@ -33,7 +33,6 @@ Recommends: fonts-beteckna,
             fonts-oflb-euterpe,
             fonts-okolaks,
             fonts-opendin,
-            fonts-rufscript,
             fonts-sil-andika,
             fonts-sil-gentium,
             fonts-ubuntu-font-family-console,

2020.1/aims-fonts/aims-fonts-2020/debian/files

+aims-fonts_2020.2_all.deb utils optional
+aims-fonts_2020.2_amd64.buildinfo utils optional

2020.1/aims-keyring/aims-keyring-2020/debian/copyright

-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: aims-keyring
-Source: https://bitbucket.org/aims_za/aims-desktop-metapackages
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: aims-desktop-metapackages
+Source: https://git.aims.ac.za/aims-desktop/aims-desktop-metapackages
 
 Files: *
-Copyright: 2016 African Institute for Mathematical Sciences
+Copyright: 2016-2018 African Institute for Mathematical Sciences
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

2020.1/aims-language-standard/aims-language-standard-2020/debian/copyright

-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: aims-language-standard
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: aims-desktop-metapackages
+Source: https://git.aims.ac.za/aims-desktop/aims-desktop-metapackages
 
-Copyright: 2012 Jan Groenewald <jan@aims.ac.za>
-License: GPL-3.0+
- This program is free software: you can redistribute it and/or modify
+Files: *
+Copyright: 2016-2018 African Institute for Mathematical Sciences
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
@@ -14,7 +16,7 @@ License: GPL-3.0+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".