From b72f2c55e7ca10624489437d9bf3e66adb64fbf7 Mon Sep 17 00:00:00 2001 From: Dirk Heinrichs Date: Wed, 8 Jul 2020 11:21:18 +0200 Subject: [PATCH 1/3] Starting with apt 1.6, https support has moved into the main package and apt-transport-https has become a transitional dummy package. --- INSTALL.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index ef80a26c3fab..145d9796d991 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -259,6 +259,13 @@ Synapse via https://packages.matrix.org/debian/. They are available for Debian ``` sudo apt install -y lsb-release wget apt-transport-https +``` +for Debian/Ubuntu versions shipping `apt` < 1.6 (Debian < 10 / Ubuntu < 18.04), or +``` +sudo apt install -y lsb-release wget +``` +for Debian 10 / Ubuntu 18.04 and newer, followed by +``` sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/matrix-org.list From 45f9f1231ce05e620185e8d3e9523454f60591da Mon Sep 17 00:00:00 2001 From: Dirk Heinrichs Date: Wed, 8 Jul 2020 11:30:09 +0200 Subject: [PATCH 2/3] Add changelog entry. --- changelog.d/7801.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7801.doc diff --git a/changelog.d/7801.doc b/changelog.d/7801.doc new file mode 100644 index 000000000000..63ad5576b052 --- /dev/null +++ b/changelog.d/7801.doc @@ -0,0 +1 @@ +Change documentation reg. apt-transport-https package, which is no longer needed on Debian 10/Ubuntu 18.04 and newer. From 6790fe7bb8b1e0522c473676470ee726ae2a9bba Mon Sep 17 00:00:00 2001 From: Dirk Heinrichs Date: Wed, 8 Jul 2020 11:42:03 +0200 Subject: [PATCH 3/3] Add changes as requested. --- INSTALL.md | 4 ++++ changelog.d/7801.doc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 145d9796d991..38af275fc250 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -260,11 +260,15 @@ Synapse via https://packages.matrix.org/debian/. They are available for Debian ``` sudo apt install -y lsb-release wget apt-transport-https ``` + for Debian/Ubuntu versions shipping `apt` < 1.6 (Debian < 10 / Ubuntu < 18.04), or + ``` sudo apt install -y lsb-release wget ``` + for Debian 10 / Ubuntu 18.04 and newer, followed by + ``` sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" | diff --git a/changelog.d/7801.doc b/changelog.d/7801.doc index 63ad5576b052..9e5cebf3efbf 100644 --- a/changelog.d/7801.doc +++ b/changelog.d/7801.doc @@ -1 +1 @@ -Change documentation reg. apt-transport-https package, which is no longer needed on Debian 10/Ubuntu 18.04 and newer. +Change the installation documentation regarding the `apt-transport-https` package, which is no longer needed on Debian 10/Ubuntu 18.04 and newer.