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

2018.1/aims-desktop-2017/bin/aims-install-rstudio

@@ -6,7 +6,7 @@ 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://s3.amazonaws.com/rstudio-ide-build/desktop/debian9/x86_64/rstudio-1.2.1555-amd64.deb
+RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.2.1335-amd64.deb
 
 # New rstudio does not require jessie packages
 gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
@@ -14,5 +14,5 @@ apt-get -qq update
 apt-get -y install r-recommended libjpeg62 libedit2 libssl1.0.2 libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 libobjc-6-dev libclang1-3.8 libobjc4 libllvm3.8 libclang-3.8-dev libclang-dev libclang-common-3.8-dev
 cd /tmp
 wget -c $RSTUDIO
-dpkg-sig --verify ${RSTUDIO#https://s3.amazonaws.com/rstudio-ide-build/desktop/debian9/x86_64/} && \
-dpkg -i ${RSTUDIO#https://s3.amazonaws.com/rstudio-ide-build/desktop/debian9/x86_64/}
+dpkg-sig --verify ${RSTUDIO#https://download1.rstudio.org/desktop/bionic/amd64/} && \
+dpkg -i ${RSTUDIO#https://download1.rstudio.org/desktop/bionic/amd64/}

2018.1/aims-desktop-2017/debian/changelog

+aims-desktop (1:2019.07.03) stretch; urgency=medium
+
+  * Revert to released rstudio.
+
+ -- Jan Groenewald <jan@aims.ac.za>  Wed, 03 Jul 2019 08:53:45 +0000
+
 aims-desktop (1:2019.07.02) stretch; urgency=medium
 
   * Fix new rstudio url editing

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

 #!/bin/bash
 
 #RSTUDIO=https://download1.rstudio.org/desktop/debian9/x86_64/rstudio-1.2.1335-amd64.deb
-RSTUDIO=https://s3.amazonaws.com/rstudio-ide-build/desktop/bionic/amd64/rstudio-1.2.1555-amd64.deb
+RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.2.1335-amd64.deb
 
 gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
 apt-get -qq update
 apt-get -y install r-recommended libedit2 libssl1.1 libclang-dev libobjc-8-dev libobjc4
 cd /tmp
 wget -c $RSTUDIO
-dpkg-sig --verify ${RSTUDIO#https://s3.amazonaws.com/rstudio-ide-build/desktop/bionic/amd64/} && \
-dpkg -i ${RSTUDIO#https://s3.amazonaws.com/rstudio-ide-build/desktop/bionic/amd64/}
+dpkg-sig --verify ${RSTUDIO#https://download1.rstudio.org/desktop/bionic/amd64/} && \
+dpkg -i ${RSTUDIO#https://download1.rstudio.org/desktop/bionic/amd64/}
 

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

+aims-desktop (1:2020.46) buster; urgency=medium
+
+  * Revert to released rstudio
+
+ -- Jan Groenewald <jan@aims.ac.za>  Wed, 03 Jul 2019 08:55:40 +0000
+
 aims-desktop (1:2020.45) buster; urgency=medium
 
   * Update rstudio to 1.2.1555