From 851a8d1fee01c0e62c16d26f064f6e0c7a5cd365 Mon Sep 17 00:00:00 2001 From: Michele Cereda Date: Tue, 23 May 2023 21:26:16 +0200 Subject: [PATCH] chore: aligned sources lists for debian --- .../{debian-buster.list => debian-10-buster.list} | 3 ++- examples/apt/sources.list.d/debian-11-bullseye.list | 8 ++++++++ examples/apt/sources.list.d/debian-12-bookworm.list | 8 ++++++++ examples/apt/sources.list.d/debian-bullseye.list | 8 -------- examples/apt/sources.list.d/debian-stable.list | 8 ++++++-- examples/apt/sources.list.d/debian-testing.list | 9 ++++++--- examples/apt/sources.list.d/debian-unstable.list | 2 +- 7 files changed, 31 insertions(+), 15 deletions(-) rename examples/apt/sources.list.d/{debian-buster.list => debian-10-buster.list} (65%) create mode 100644 examples/apt/sources.list.d/debian-11-bullseye.list create mode 100644 examples/apt/sources.list.d/debian-12-bookworm.list delete mode 100644 examples/apt/sources.list.d/debian-bullseye.list diff --git a/examples/apt/sources.list.d/debian-buster.list b/examples/apt/sources.list.d/debian-10-buster.list similarity index 65% rename from examples/apt/sources.list.d/debian-buster.list rename to examples/apt/sources.list.d/debian-10-buster.list index 0fc50f7..ffb30be 100644 --- a/examples/apt/sources.list.d/debian-buster.list +++ b/examples/apt/sources.list.d/debian-10-buster.list @@ -1,4 +1,5 @@ -deb http://deb.debian.org/debian/ buster main non-free contrib +deb http://deb.debian.org/debian/ buster main contrib non-free +deb http://security.debian.org/ buster/updates main contrib non-free # buster-updates, previously known as 'volatile' deb http://deb.debian.org/debian/ buster-updates main contrib non-free diff --git a/examples/apt/sources.list.d/debian-11-bullseye.list b/examples/apt/sources.list.d/debian-11-bullseye.list new file mode 100644 index 0000000..4a6bc36 --- /dev/null +++ b/examples/apt/sources.list.d/debian-11-bullseye.list @@ -0,0 +1,8 @@ +deb http://deb.debian.org/debian bullseye main contrib non-free +deb http://security.debian.org/debian-security bullseye-security main contrib non-free + +# bullseye-updates, previously known as 'volatile' +deb http://deb.debian.org/debian bullseye-updates main contrib non-free + +# bullseye-backports, previously on backports.debian.org +deb http://deb.debian.org/debian bullseye-backports main contrib non-free diff --git a/examples/apt/sources.list.d/debian-12-bookworm.list b/examples/apt/sources.list.d/debian-12-bookworm.list new file mode 100644 index 0000000..5af1df1 --- /dev/null +++ b/examples/apt/sources.list.d/debian-12-bookworm.list @@ -0,0 +1,8 @@ +deb http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free +deb http://security.debian.org/debian-security bookworm-security main contrib non-free-firmware non-free + +# bookworm-updates, previously known as 'volatile' +deb http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free + +# bookworm-backports, previously on backports.debian.org +deb http://deb.debian.org/debian bookworm-backports main contrib non-free-firmware non-free diff --git a/examples/apt/sources.list.d/debian-bullseye.list b/examples/apt/sources.list.d/debian-bullseye.list deleted file mode 100644 index 620a233..0000000 --- a/examples/apt/sources.list.d/debian-bullseye.list +++ /dev/null @@ -1,8 +0,0 @@ -deb http://deb.debian.org/debian/ bullseye main non-free contrib -deb http://security.debian.org/debian-security bullseye-security main contrib non-free - -# bullseye-updates, previously known as 'volatile' -deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free - -# bullseye-backports, previously on backports.debian.org -deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free diff --git a/examples/apt/sources.list.d/debian-stable.list b/examples/apt/sources.list.d/debian-stable.list index bc55b1b..484b704 100644 --- a/examples/apt/sources.list.d/debian-stable.list +++ b/examples/apt/sources.list.d/debian-stable.list @@ -1,4 +1,8 @@ -deb http://deb.debian.org/debian/ stable main non-free contrib +deb http://deb.debian.org/debian stable main contrib non-free-firmware non-free +deb http://security.debian.org/debian-security stable-security main contrib non-free-firmware non-free # stable-updates, previously known as 'volatile' -deb http://deb.debian.org/debian/ stable-updates main contrib non-free +deb http://deb.debian.org/debian stable-updates main contrib non-free-firmware non-free + +# stable-backports, previously on backports.debian.org +deb http://deb.debian.org/debian stable-backports main contrib non-free-firmware non-free diff --git a/examples/apt/sources.list.d/debian-testing.list b/examples/apt/sources.list.d/debian-testing.list index 8c55ed0..1f40310 100644 --- a/examples/apt/sources.list.d/debian-testing.list +++ b/examples/apt/sources.list.d/debian-testing.list @@ -1,5 +1,8 @@ -deb http://deb.debian.org/debian/ testing main non-free contrib -deb http://security.debian.org/debian-security testing-security main contrib non-free +deb http://deb.debian.org/debian testing main contrib non-free-firmware non-free +deb http://security.debian.org/debian-security testing-security main contrib non-free-firmware non-free # testing-updates, previously known as 'volatile' -deb http://deb.debian.org/debian/ testing-updates main contrib non-free +deb http://deb.debian.org/debian testing-updates main contrib non-free-firmware non-free + +# testing-backports, previously on backports.debian.org +deb http://deb.debian.org/debian testing-backports main contrib non-free-firmware non-free diff --git a/examples/apt/sources.list.d/debian-unstable.list b/examples/apt/sources.list.d/debian-unstable.list index e6c36eb..e3106d0 100644 --- a/examples/apt/sources.list.d/debian-unstable.list +++ b/examples/apt/sources.list.d/debian-unstable.list @@ -1 +1 @@ -deb http://deb.debian.org/debian/ unstable main non-free contrib +deb http://deb.debian.org/debian unstable main contrib non-free-firmware non-free