From 960212c164d802ca3cb25d75838e2093e38a2e63 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Tue, 23 Feb 2021 16:14:11 -0600
Subject: [PATCH] Update docs on installing on Debian
---
packages-debian.md | 38 +++++++++++---------------------------
1 file changed, 11 insertions(+), 27 deletions(-)
diff --git a/packages-debian.md b/packages-debian.md
index 09ec9eb..5b1794d 100644
--- a/packages-debian.md
+++ b/packages-debian.md
@@ -5,33 +5,14 @@ layout: main
## Distribution
-Monado is packaged in Debian Unstable (sid), uploaded typically when a new release is tagged. Once a blocker in another package is resolved, it will migrate to Testing (bullseye) and we'll be able to upload a package to buster-backports as well.
+Monado is packaged in Debian Unstable (sid), uploaded typically when a new release is tagged. Barring any freezes or dependency issues, the packages automatically migrate to Testing (bullseye). At that time, we typically try to upload a package to buster-backports as well.
-xr-hardware and the OpenXR loader are in sid and bullseye already.
+xr-hardware and the OpenXR loader are also in sid, bullseye, and buster-backports already.
-## Open Build Service - intermittently uploaded for buster
-
-Monado and friends (the OpenXR loader, SDK, and the xr-hardware udev rules) are packaged on Open Build Service.
-
-For Debian 10 (Buster):
-
-```sh
-# Download signing key - fingerprint E841 FAF3 32F5 9D73 9A7F 9D9E FBB1 3322 8F00 CDBA
-wget -nv https://download.opensuse.org/repositories/home:rpavlik:monado/Debian-10/Release.key -O obs-monado.asc
-
-# Add to apt
-sudo mv obs-monado.asc /etc/apt/trusted.gpg.d/
-
-# Add apt repo
-echo 'deb http://download.opensuse.org/repositories/home:/rpavlik:/monado/Debian-10/ /' | sudo tee /etc/apt/sources.list.d/monado.list
-
-# Update package lists
-sudo apt update
-```
-
-For a description of the packages see [Getting Started]({% link getting-started.md %}).
-
-More info about the packages is at: <https://build.opensuse.org/project/show/home:rpavlik:monado>
+All Debian and Ubuntu packages of Monado for Linux are built with service
+support enabled: see
+[these notes](https://gitlab.freedesktop.org/monado/monado/-/blob/debian/sid/debian/NEWS)
+on how to enable, start, and stop Monado.
## CI builds for buster
@@ -39,7 +20,7 @@ If you like living dangerously, you can install packages directly from the lates
```sh
# Download CI signing key
-sudo wget -nv https://people.collabora.com/~rpavlik/monado-ci-packages/monado-ci.asc -O /etc/apt/trusted.gpg.d/monado-ci.asc
+sudo wget -nv https://monado.freedesktop.org/keys/monado-ci.asc -O /etc/apt/trusted.gpg.d/monado-ci.asc
# Add apt repo
echo 'deb https://monado.pages.freedesktop.org/monado/apt buster main' | sudo tee /etc/apt/sources.list.d/monado-ci.list
@@ -48,4 +29,7 @@ echo 'deb https://monado.pages.freedesktop.org/monado/apt buster main' | sudo te
sudo apt update
```
-To install from a single, specific CI job on master, use `https://gitlab.freedesktop.org/monado/monado/-/jobs/<job-num>/artifacts/raw/repo` as the URL in the listfile instead.
+For a description of the packages see [Getting Started]({% link
+getting-started.md %}). Note that only the Monado packages are in this package
+repo: you still will want to install the OpenXR loader and xr-hardware from
+Debian (or backports).
--
GitLab