diff options
| author | Julian Andres Klode <jak@debian.org> | 2021-01-07 11:34:30 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2021-01-07 11:34:30 +0000 |
| commit | cf883949f245af02049d1b24ecfd2145e1958078 (patch) | |
| tree | d389646d21611fb8ef5c10b3d01fcc89d36c7bf4 | |
| parent | 4d9df23b9c2c7039f2e4e7c19df57bfcdef9502b (diff) | |
| parent | 7ad5d4a7cc9f43fe84c51cd23d5440a3c8c3774d (diff) | |
Merge branch 'pu/bump-codenames' into 'master'
Bump codenames to bullseye/hirsute and adjust -security codename
See merge request apt-team/apt!147
| -rw-r--r-- | doc/apt-verbatim.ent | 10 | ||||
| -rw-r--r-- | vendor/debian/sources.list.in | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index a71dc7e55..2d70dc9e5 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -277,11 +277,11 @@ <!ENTITY apt-product-version "2.1.15"> <!-- (Code)names for various things used all over the place --> -<!ENTITY debian-oldstable-codename "stretch"> -<!ENTITY debian-stable-codename "buster"> -<!ENTITY debian-testing-codename "bullseye"> -<!ENTITY debian-stable-version "10"> -<!ENTITY ubuntu-codename "groovy"> +<!ENTITY debian-oldstable-codename "buster"> +<!ENTITY debian-stable-codename "bullseye"> +<!ENTITY debian-testing-codename "bookworm"> +<!ENTITY debian-stable-version "11"> +<!ENTITY ubuntu-codename "hirsute"> <!-- good and bad just refers to matching and not matching a pattern… It is not a remark about the specific perl version. diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in index 73a2ec9c4..7cffd782d 100644 --- a/vendor/debian/sources.list.in +++ b/vendor/debian/sources.list.in @@ -4,4 +4,4 @@ # Uncomment if you want the apt-get source function to work #deb-src http://deb.debian.org/debian &debian-stable-codename; main contrib non-free -#deb-src http://security.debian.org &debian-stable-codename;/updates main contrib non-free +#deb-src http://security.debian.org &debian-stable-codename;-security main contrib non-free |