Commit 1c573cfc authored by Jonathan Carter's avatar Jonathan Carter
Browse files

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

parents bf7055c5 c916c287
sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/' /etc/default/grub
update-grub
......@@ -6,9 +6,13 @@ for PKG in libgstreamer0.10-0 libgstreamer-plugins-base0.10-0 libssl1.0.0; do
dpkg -s $PKG >/dev/null 2>&1 && apt-get -y purge $PKG;
done
RSTUDIO=https://download1.rstudio.org/rstudio-xenial-1.1.463-amd64.deb
# New rstudio does not require jessie packages
gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
apt-get -qq update
apt-get -y install r-recommended
cd /tmp
wget -c https://download1.rstudio.org/rstudio-xenial-1.1.456-amd64.deb
dpkg -i rstudio-xenial-1.1.456-amd64.deb
wget -c $RSTUDIO
dpkg-sig --verify ${RSTUDIO#https://download1.rstudio.org/}
dpkg -i ${RSTUDIO#https://download1.rstudio.org/}
aims-desktop (2018.12.02) stretch; urgency=medium
* Fix syntax and fix evince mime bug
-- Jan Groenewald <jan@aims.ac.za> Tue, 25 Dec 2018 16:51:05 +0000
aims-desktop (2018.12.01) stretch; urgency=medium
* Fix /etc/X11/app-defaults/XTerm detection
-- Jan Groenewald <jan@aims.ac.za> Mon, 24 Dec 2018 08:25:47 +0000
aims-desktop (2018.11.04) stretch; urgency=medium
* Fix reregression in aims-install-rsstudio
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 10:01:46 +0000
aims-desktop (2018.11.03) stretch; urgency=medium
* Fix regression in aims-install-rstudio
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 09:55:10 +0000
aims-desktop (2018.11.02) stretch; urgency=medium
* Add dpkg-sig for rstudio verification
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 09:48:55 +0000
aims-desktop (2018.11.01) stretch; urgency=medium
* Update aims-install-rstudio to 1.1.463
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 09:23:15 +0000
aims-desktop (2018.09.09ubuntu1) stretch; urgency=medium
* Add world clocks to live
......
......@@ -33,6 +33,7 @@ Recommends: aims-artwork,
cython3,
debconf-utils,
dirmngr,
dpkg-sig,
dvipng,
fbreader,
feynmf,
......
......@@ -2,7 +2,6 @@ aims-collect-support-data.desktop usr/share/applications
aims-starburst.png usr/share/pixmaps
bin/aims-collect-support-data usr/bin
bin/aims-complete-install usr/sbin
bin/aims-fix-grub-splash usr/sbin
bin/aims-install-irkernel usr/sbin
bin/aims-install-r35 usr/sbin
bin/aims-install-restricted-extras usr/sbin
......
......@@ -3,8 +3,12 @@
glib-compile-schemas /usr/share/glib-2.0/schemas/
glib-compile-schemas /usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/schemas/
update-desktop-database
# bug in evince
sed -i 's/;;/;/' /usr/share/applications/evince.desktop
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)
if [ -e /etc/X11/app-defaults/XTerm ] && [ ! -e /etc/X11/app-defaults/XTerm.orig ]
then
cp /etc/X11/app-defaults/XTerm /etc/X11/app-defaults/XTerm.orig && cat /etc/X11/app-defaults/XTerm.QVT >> /etc/X11/app-defaults/XTerm
fi
sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/' /etc/default/grub
update-grub
#!/bin/bash
echo "deb http://cloud.r-project.org/bin/linux/debian stretch-cran35/" > /etc/apt/sources.list.d/cran.list
apt-key adv --keyserver=keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF'
apt-get -qq update
apt-get -y install r-base r-base-dev r-recommended
echo "You may want to:"
echo " * sudo apt-get -y autoremove"
echo " * sudo apt-get clean"
echo " * re-install any R packages in ~/.local/lib/R/site-packages or /usr/local/lib/R/site-packages"
echo " * specifically IRkernel, by removing /usr/local/lib/R/site-packages/* and then sudo aims-install-irkernel"
#!/bin/bash
# Rstudio 1.0.143 and before required 3 jessie packages to run on stretch
[ -f /etc/apt/sources.list.d/jessie.list ] && mv /etc/apt/sources.list.d/jessie.list{,.disabled}
for PKG in libgstreamer0.10-0 libgstreamer-plugins-base0.10-0 libssl1.0.0; do
dpkg -s $PKG >/dev/null 2>&1 && apt-get -y purge $PKG;
done
RSTUDIO=https://download1.rstudio.org/rstudio-xenial-1.1.463-amd64.deb
# New rstudio does not require jessie packages
gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
apt-get -qq update
apt-get -y install r-recommended
cd /tmp
wget -c https://download1.rstudio.org/rstudio-xenial-1.1.456-amd64.deb
dpkg -i rstudio-xenial-1.1.456-amd64.deb
wget -c $RSTUDIO
dpkg-sig --verify ${RSTUDIO#https://download1.rstudio.org/}
dpkg -i ${RSTUDIO#https://download1.rstudio.org/}
aims-desktop (2020.11) buster; urgency=medium
* Remove aims-install-r35
-- Jan Groenewald <jan@aims.ac.za> Tue, 08 Jan 2019 08:02:06 +0000
aims-desktop (2020.10) buster; urgency=medium
* Add unattended-upgrades
-- Jan Groenewald <jan@aims.ac.za> Tue, 08 Jan 2019 07:02:59 +0000
aims-desktop (2020.9) buster; urgency=medium
* Fix syntax error
-- Jan Groenewald <jan@aims.ac.za> Tue, 25 Dec 2018 16:53:28 +0000
aims-desktop (2020.8) buster; urgency=medium
* Fix detection of /etc/X11/app-defaults/XTerm
-- Jan Groenewald <jan@aims.ac.za> Mon, 24 Dec 2018 08:29:51 +0000
aims-desktop (2020.7) buster; urgency=medium
* Fix reregression in aims-install-rstudio
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 10:03:06 +0000
aims-desktop (2020.6) stretch; urgency=medium
* Fix regression in aims-install-rstudio
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 09:56:29 +0000
aims-desktop (2020.5) buster; urgency=medium
* Add dpkg-sig for rstudio verification
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 09:50:59 +0000
aims-desktop (2020.4) buster; urgency=medium
* Non-maintainer upload.
* Update aims-install-rstudio to 1.1.463
* Remove testing for jessie sources and rstudio dependencies from 2020
version
* Remove aims-fix-grub-splash
-- Jan Groenewald <jan@aims.ac.za> Thu, 01 Nov 2018 09:27:05 +0000
aims-desktop (2020.3) buster; urgency=medium
* Remove dconf settings that are no longer used
......
......@@ -32,6 +32,7 @@ Recommends: aims-artwork,
cython3,
debconf-utils,
dirmngr,
dpkg-sig,
dvipng,
fbreader,
feynmf,
......@@ -182,6 +183,7 @@ Recommends: aims-artwork,
texstudio | texmaker,
tmux,
typespeed,
unattended-upgrades,
virtualbox-guest-x11,
vlc,
wireless-tools,
......
......@@ -2,9 +2,7 @@ aims-collect-support-data.desktop usr/share/applications
aims-starburst.png usr/share/pixmaps
bin/aims-collect-support-data usr/bin
bin/aims-complete-install usr/sbin
bin/aims-fix-grub-splash usr/sbin
bin/aims-install-irkernel usr/sbin
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
......
......@@ -6,8 +6,10 @@ update-desktop-database
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)
if [ -e /etc/X11/app-defaults/XTerm ] && [ ! -e /etc/X11/app-defaults/XTerm.orig ]
then
cp /etc/X11/app-defaults/XTerm /etc/X11/app-defaults/XTerm.orig && cat /etc/X11/app-defaults/XTerm.QVT >> /etc/X11/app-defaults/XTerm
fi
# We play it very conservative, if this file doessn't exist at all,
# we write it.
......
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