Merge pull request #64 from ultrabug/master

[i3/i3.github.io] / _docs / repositories

diff --git a/_docs/repositories b/_docs/repositories
index e2943a32017a457cf489377f24b17d14f0121644..10555c6e49ce4c7624f8ea3432b84a8f71f0dd6b 100644 (file)
--- a/_docs/repositories
+++ b/_docs/repositories
@@ -1,7 +1,7 @@
 Debian and Ubuntu repositories
 ==============================
 Michael Stapelberg <michael@i3wm.org>
-September 2016
+November 2018
 
 == When should you use our repositories?
 
@@ -33,12 +33,17 @@ If you want the latest i3 development version::
 This Ubuntu repository is provided by sur5r and contains the latest stable
 release of i3. To use it, run the following commands:
 
+////////////////////////////////////////////////////////////////////////////////
+TODO: Replace dpkg -i with apt install ./ below after 2019-05.
+See https://github.com/i3/i3.github.io/pull/35
+////////////////////////////////////////////////////////////////////////////////
+
 ---------------------------------------------------------------------------------
-# echo "deb http://debian.sur5r.net/i3/ $(lsb_release -c -s) universe" >> /etc/apt/sources.list
-# apt-get update
-# apt-get --allow-unauthenticated install sur5r-keyring
-# apt-get update
-# apt-get install i3
+$ /usr/lib/apt/apt-helper download-file http://debian.sur5r.net/i3/pool/main/s/sur5r-keyring/sur5r-keyring_2019.02.01_all.deb keyring.deb SHA256:176af52de1a976f103f9809920d80d02411ac5e763f695327de9fa6aff23f416
+# dpkg -i ./keyring.deb
+# echo "deb http://debian.sur5r.net/i3/ $(grep '^DISTRIB_CODENAME=' /etc/lsb-release | cut -f2 -d=) universe" >> /etc/apt/sources.list.d/sur5r-i3.list
+# apt update
+# apt install i3
 ---------------------------------------------------------------------------------
 
 All Ubuntu versions which are currently supported by Ubuntu itself are also supported by
@@ -52,16 +57,15 @@ This Ubuntu repository contains packages which are automatically built a few
 minutes after every commit. To use it, run the following commands:
 
 ---------------------------------------------------------------------------------
-# echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list
-# apt-get update
-# apt-get --allow-unauthenticated install i3-autobuild-keyring
-# rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_*
-# apt-get update
-# apt-get install i3
+$ /usr/lib/apt/apt-helper download-file http://dl.bintray.com/i3/i3-autobuild-ubuntu/pool/main/i/i3-autobuild-keyring/i3-autobuild-keyring_2016.10.01_all.deb keyring.deb SHA256:460e8c7f67a6ae7c3996cc8a5915548fe2fee9637b1653353ec62b954978d844
+# apt install ./keyring.deb
+# echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu bionic main' > /etc/apt/sources.list.d/i3-autobuild.list
+# apt update
+# apt install i3
 ---------------------------------------------------------------------------------
 
 Development versions are only available for the latest version of Ubuntu, which
-is xenial at the moment.
+is bionic at the moment.
 
 == Debian repository
 
@@ -69,12 +73,11 @@ Our Debian repository contains packages which are automatically built a few
 minutes after every commit. To use it, run the following commands:
 
 ---------------------------------------------------------------------------------
+$ /usr/lib/apt/apt-helper download-file http://dl.bintray.com/i3/i3-autobuild/pool/main/i/i3-autobuild-keyring/i3-autobuild-keyring_2016.10.01_all.deb keyring.deb SHA256:460e8c7f67a6ae7c3996cc8a5915548fe2fee9637b1653353ec62b954978d844
+# apt install ./keyring.deb
 # echo 'deb http://dl.bintray.com/i3/i3-autobuild sid main' > /etc/apt/sources.list.d/i3-autobuild.list
-# apt-get update
-# apt-get --allow-unauthenticated install i3-autobuild-keyring
-# rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_*
-# apt-get update
-# apt-get install i3
+# apt update
+# apt install i3
 ---------------------------------------------------------------------------------
 
 == Preferring the autobuilder version of i3