Move adobe/zoom/teamviewer to restricted

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

+aims-desktop (1:2020.86) buster; urgency=medium
+
+  * Move adobe/zoom/teamviewer to restricted
+
+ -- Jan Groenewald <jan@aims.ac.za>  Fri, 05 Mar 2021 10:30:45 +0200
+
 aims-desktop (1:2020.85) buster; urgency=medium
 
   * Update rstudio download link

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

@@ -3,7 +3,6 @@ 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
@@ -11,8 +10,6 @@ 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
 conf/gsettings/95_dashtodock.gschema.override usr/share/glib-2.0/schemas

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

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

2020.1/aims-restricted-extras/aims-restricted-extras-2020/debian/changelog

+aims-restricted-extras (2020.13) buster; urgency=medium
+
+  * Move adobe/zoom/teamviewer scripts to restricted
+
+ -- Jan Groenewald <jan@aims.ac.za>  Fri, 05 Mar 2021 10:29:14 +0200
+
 aims-restricted-extras (2020.12) buster; urgency=medium
 
   * Update Google archive signing key

2020.1/aims-restricted-extras/aims-restricted-extras-2020/debian/install

-aims-install-geogebra-non-free usr/sbin
-aims-install-google-chrome usr/sbin
-aims-install-virtualbox usr/sbin
-aims-restricted-extras-setup usr/sbin
+bin/aims-install-adobe-reader usr/sbin
+bin/aims-install-geogebra-non-free usr/sbin
+bin/aims-install-google-chrome usr/sbin
+bin/aims-install-teamviewer usr/sbin
+bin/aims-install-zoom usr/sbin
+bin/aims-install-virtualbox usr/sbin
+bin/aims-restricted-extras-setup usr/sbin
 aptconf usr/share/aims
 aptkeys usr/share/aims
 aptkeys.gpg/* etc/apt/trusted.gpg.d/

2020.1/aims-restricted-extras/aims-restricted-extras-2020/debian/postinst

 #!/bin/sh
 
-# Importing ppa keys...
-#echo "Importing PPA GPG Keys..."
-#apt-key add /usr/share/aims/aptkeys/google_linux_signing_key-2017.pub
-#apt-key add /usr/share/aims/aptkeys/google_linux_signing_key-2018.pub
-#apt-key add /usr/share/aims/aptkeys/office@geogebra.org.gpg.key
-#apt-key add /usr/share/aims/aptkeys/oracle_vbox_2016.asc
-#apt-key add /usr/share/aims/aptkeys/oracle_vbox.asc
-#apt-key add /usr/share/aims/aptkeys/signal-keys.asc
-#apt-key add /usr/share/aims/aptkeys/SKYPE-GPG-KEY
-
-echo "To add additional non-free software that requires an Internet connection to install,"
-echo "run the following command:"
+echo "To add additional non-free software that requires an Internet connection"
+echo "to install, run the following command:"
+echo
 echo "sudo aims-restricted-extras-setup"
+echo