Commit 98e7ac1c authored by Jonathan Carter's avatar Jonathan Carter
Browse files

Some live updates

parent 21800d91
......@@ -4,10 +4,10 @@ componentName: aimsdesktop
strings:
productName: AIMS Desktop
shortProductName: AIMS Desktop
version: 2020.2
shortVersion: 2020.2
versionedName: AIMS Desktop 2020.2
shortVersionedName: AIMS Desktop 2020.2
version: 2022.1
shortVersion: 2022.1
versionedName: AIMS Desktop 2022.1
shortVersionedName: AIMS Desktop 2022.1
bootloaderEntryName: AIMS Desktop
productUrl: https://aims.ac.za
supportUrl: https://help.aims.ac.za
......
......@@ -6,24 +6,24 @@ cat <<EOF > $CHROOT/etc/apt/sources.list
## Debian
# Main
deb http://deb.debian.org/debian buster main
#deb-src http://deb.debian.org/debian buster main
deb http://deb.debian.org/debian bullseye main
#deb-src http://deb.debian.org/debian bullseye main
# Updates
deb http://deb.debian.org/debian buster-updates main
#deb-src http://deb.debian.org/debian buster-updates main
deb http://deb.debian.org/debian bullseye-updates main
#deb-src http://deb.debian.org/debian bullseye-updates main
# Backports (cherrypick only!)
deb http://deb.debian.org/debian buster-backports main
#deb-src http://deb.debian.org/debian buster-backports main
deb http://deb.debian.org/debian bullseye-backports main
#deb-src http://deb.debian.org/debian bullseye-backports main
# Security (unattended upgrades)
deb http://security.debian.org/ buster/updates main
#deb-src http://security.debian.org/ buster/updates main
deb http://security.debian.org/ bullseye/updates main
#deb-src http://security.debian.org/ bullseye/updates main
## AIMS Desktop
deb http://ppa.aims.ac.za/aims-ppa buster main restricted
#deb-src http://ppa.aims.ac.za/aims-ppa buster main restricted
deb http://ppa.aims.ac.za/aims-ppa bullseye main restricted
#deb-src http://ppa.aims.ac.za/aims-ppa bullseye main restricted
EOF
......@@ -5,7 +5,7 @@
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
/bin/echo "#AIMS Desktop Installer" > $CHROOT/etc/apt/sources.list
/bin/echo "deb [trusted=yes] file:///media/installer buster main" >> $CHROOT/etc/apt/sources.list
/bin/echo "deb [trusted=yes] file:///media/installer bullseye main" >> $CHROOT/etc/apt/sources.list
chroot $CHROOT /usr/bin/apt-get update
exit 0
aims-live (1:2022.2) bullseye; urgency=medium
* Replace calamares scripts s/buster/bullseye/g
* Remove some conflicts preventing sagemath to be installed
-- Jonathan Carter <jonathan@aims.ac.za> Wed, 24 Mar 2021 16:25:16 +0200
aims-live (1:2022.1) bullseye; urgency=medium
* Initial bullseye PPA upload
......
......@@ -40,8 +40,6 @@ Conflicts: antiword,
libmpfr-dev,
mercurial,
nauty-doc,
pari-galpol,
pari-gp2c,
python-4suite-xml,
python-attr-doc,
python-cairocffi,
......@@ -88,9 +86,7 @@ Conflicts: antiword,
python-wxgtk3.0,
python-xml,
python-zope.testing,
sagetex-doc,
sagemath-doc-en,
singular-doc,
sagemath-doc-en,
singular-dev-doc,
slime,
sphinx-doc,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment