Remove geogebra.list by default and move into aims-install-geogebra-non-free

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

-apt-get -qq update
-apt-get -y install geogebra-classic

2020.1/aims-restricted-extras/aims-restricted-extras-2020/aims-install-geogebra-non-free

+#!/bin/bash
+
+echo " * Enabling GeoGebra repositories..."
+if [ -f /usr/share/aims/ppalists/geogebra.list ]; then
+    cp /usr/share/aims/ppalists/geogebra.list \
+       /etc/apt/sources.list.d/geogebra.list
+fi
+echo " * Updating available package lists..."
+apt-get -qq update
+apt-get -y install geogebra-classic
+
+

2020.1/aims-restricted-extras/aims-restricted-extras-2020/aims-restricted-extras-setup

@@ -3,11 +3,14 @@
 # Setting up PPAs...
 
 # Enable for geogebra
-echo " * Enabling GeoGebra repositories..."
-if [ -f /usr/share/aims/ppalists/geogebra.list ]; then
-    cp /usr/share/aims/ppalists/geogebra.list \
-       /etc/apt/sources.list.d/geogebra.list
-fi
+# Doing this here will enable geogebra.list, upgrade Debian stable geogebra to
+# geogebra from geogebra.list at next apt upgrades to a broken state, and
+# not install geogebra-classic. This is moved out to aims-install-geogebra
+#echo " * Enabling GeoGebra repositories..."
+#if [ -f /usr/share/aims/ppalists/geogebra.list ]; then
+#    cp /usr/share/aims/ppalists/geogebra.list \
+#       /etc/apt/sources.list.d/geogebra.list
+#fi
 
 # Enable for google-chrome
 echo " * Enabling Google Chrome repositories..."

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

+aims-restricted-extras (2020.11) buster; urgency=medium
+
+  * Remove geogebra.list by default, move to aims-install-geogebra-non-free
+
+ -- Jan Groenewald <jan@aims.ac.za>  Mon, 12 Aug 2019 12:29:04 +0000
+
 aims-restricted-extras (2020.10) buster; urgency=medium
 
   * Fix geogebra.list

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

-aims-install-geogebra usr/sbin
+aims-install-geogebra-non-free usr/sbin
 aims-install-google-chrome usr/sbin
 aims-install-virtualbox usr/sbin
 aims-restricted-extras-setup usr/sbin