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

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-adobe-reader

+#!/bin/bash
+
+cd /tmp
+# dpkg --add-architecture i386
+wget -c http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.5/enu/AdbeRdr9.5.5-1_i386linux_enu.deb
+apt -f install ./AdbeRdr9.5.5-1_i386linux_enu.deb

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-restricted-extras

@@ -11,6 +11,8 @@ if [ $ANSWER = "Yes" ]; then
 	systemctl stop unattended-upgrades
 	apt-get -y install aims-restricted-extras
 	aims-restricted-extras-setup
+	aims-install-zoom
+	aims-install-teamviewer
 	systemctl start apt-daily
 	systemctl start apt-daily-upgrade
 	systemctl start unattended-upgrades

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-rstudio

@@ -2,7 +2,7 @@
 
 #RSTUDIO=https://download1.rstudio.org/desktop/debian9/x86_64/rstudio-1.2.1335-amd64.deb
 #RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.959-amd64.deb
-RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.1073-amd64.deb
+RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.1093-amd64.deb
 
 gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
 apt-get -qq update

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-teamviewer

+#!/bin/bash
+
+cd /tmp/
+wget -c https://download.teamviewer.com/download/linux/teamviewer_amd64.deb
+apt -fy install ./teamviewer_amd64.deb

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-zoom

@@ -2,6 +2,5 @@
 
 rm -f /tmp/zoom_amd64.deb
 wget -O /tmp/zoom_amd64.deb https://zoom.us/client/latest/zoom_amd64.deb
-dpkg -i /tmp/zoom_amd64.deb
-apt-get -yf install
+apt -fy install /tmp/zoom_amd64.deb
 

2020.1/aims-desktop/aims-desktop-2020/conf/gsettings/95_aims-desktop.gschema.override

@@ -12,7 +12,7 @@ attach-modal-dialogs=false
 
 # World Clocks
 [org.gnome.clocks]
-world-clocks=[{'location': <(uint32 2, <('Biriwa, Ghana', 'DGAA', true, [(0.097738438111682452, -0.0029088879044213891)], [(0.096865773485685286, -0.0037815525304185538)])>)>}, {'location': <(uint32 2, <('M\'bour, Senegal', 'GOOY', true, [(0.25714517064273373, -0.30543261909900765)], [(0.25720335991999521, -0.30776942298121035)])>)>}, {'location': <(uint32 2, <('Kigali, Rwanda', 'HBBA', true, [(-0.057886759342242765, 0.51167236486076839)], [(-0.058924252862798274, 0.51242866838553514)])>)>}, {'location': <(uint32 2, <('Limbe, Cameroon', 'FKKD', true, [(0.069813170079773182, 0.16987870804301725)], [(0.070690686721090884, 0.16929693744344995)])>)>}, {'location': <(uint32 2, <('Muizenberg, South Africa', 'FAJS', true, [(-0.4561127053700873, 0.49276461966196816)], [(-0.45727626402251431, 0.49014662578397672)])>)>}, {'location': <(uint32 2, <('Dar es Salaam, Tanzania', 'HTDO', true, [(-0.10762864302408116, 0.62424610161440264)], [(-0.10791951959721854, 0.62395520758797285)])>)>}]
+world-clocks=[{'location': <(uint32 2, <('M\'bour, Senegal', 'GOOY', true, [(0.25714517064273373, -0.30543261909900765)], [(0.25720335991999521, -0.30776942298121035)])>)>}, {'location': <(uint32 2, <('Accra', 'DGAA', true, [(0.097738438111682452, -0.0029088879044213891)], [(0.096865773485685286, -0.0037815525304185538)])>)>}, {'location': <(uint32 2, <('Limbé, Cameroon', 'FKKD', false, [(0.069992747006510883, 0.16069347652208407)], [(0.069813170079773182, 0.16987870804301725)])>)>}, {'location': <(uint32 2, <('Kigali, Rwanda', 'HBBA', true, [(-0.057886759342242765, 0.51167236486076839)], [(-0.058924252862798274, 0.51242866838553514)])>)>}, {'location': <(uint32 2, <('Muizenberg, South Africa', 'FAJS', true, [(-0.4561127053700873, 0.49276461966196816)], [(-0.45727626402251431, 0.49014662578397672)])>)>}]
 
 # AIMS App folder
 [org.gnome.desktop.app-folders.folders.AIMS]
@@ -123,3 +123,9 @@ tap-to-click=true
 
 [org.gnome.desktop.peripherals.mouse]
 natural-scroll=false
+
+# Do not suspend on AC power 
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-battery-type='suspend'
+sleep-inactive-ac-type='nothing'
+

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

+aims-desktop (1:2020.84) buster; urgency=medium
+
+  * Add zoom and teamviewer to restricted-extras
+
+ -- Jan Groenewald <jan@aims.ac.za>  Thu, 28 Jan 2021 09:18:40 +0200
+
+aims-desktop (1:2020.83) buster; urgency=medium
+
+  * Don't auto suspend when on AC power
+
+ -- Jan Groenewald <jan@aims.ac.za>  Wed, 02 Dec 2020 11:37:04 +0000
+
+aims-desktop (1:2020.82) buster; urgency=medium
+
+ -- Change aims-install-zoom to apt -fy install instead of dpkg -i followed by
+apt-get -fy install
+
+ -- Jan Groenewald <jan@aims.ac.za>  Wed, 02 Dec 2020 11:06:01 +0000
+
+aims-desktop (1:2020.81) buster; urgency=medium
+
+  * Update AIMS centre locations in org.gnome.clocks.world-clocks
+
+ -- Jan Groenewald <jan@aims.ac.za>  Tue, 06 Oct 2020 08:45:48 +0000
+
+aims-desktop (1:2020.80) buster; urgency=medium
+
+  * Fix type in aims-install-teamviewer
+
+ -- Jan Groenewald <jan@aims.ac.za>  Wed, 30 Sep 2020 09:08:31 +0000
+
+aims-desktop (1:2020.79) buster; urgency=medium
+
+  * Add aims-install-adobe-reader
+
+ -- Jan Groenewald <jan@aims.ac.za>  Mon, 28 Sep 2020 12:28:47 +0000
+
+aims-desktop (1:2020.78) buster; urgency=medium
+
+  * Add aims-install-teamviewer to debian/install
+
+ -- Jan Groenewald <jan@aims.ac.za>  Mon, 28 Sep 2020 12:14:13 +0000
+
+aims-desktop (1:2020.77) buster; urgency=medium
+
+  * Update rstudio to 1.3.1093 and add aims-install-teamviewer
+
+ -- Jan Groenewald <jan@aims.ac.za>  Mon, 28 Sep 2020 12:10:49 +0000
+
 aims-desktop (1:2020.76) buster; urgency=medium
 
   * Update rstudio to 1.3.1073

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

@@ -3,6 +3,7 @@ aims-collect-support-data.png usr/share/pixmaps
 aims-starburst.png usr/share/pixmaps
 bin/aims-collect-support-data usr/bin
 bin/aims-complete-install usr/sbin
+bin/aims-install-adobe-reader usr/sbin
 bin/aims-install-irkernel usr/sbin
 bin/aims-install-latest-firefox usr/sbin
 bin/aims-install-macaulay2 usr/sbin
@@ -10,6 +11,7 @@ bin/aims-install-r40 usr/sbin
 bin/aims-install-restricted-extras usr/sbin
 bin/aims-install-rstudio usr/sbin
 bin/aims-install-rtl8723de usr/sbin
+bin/aims-install-teamviewer usr/sbin
 bin/aims-install-zoom 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