From a03454322f6a7fe006cf2912018bd4012bacb486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Tue, 6 Jun 2017 13:34:59 +0200 Subject: [PATCH] remove wheezy, add buster+bullseye files, rename files to include debian release number --- ...eezy.pref => prefer-debian-08-jessie.pref} | 30 +++++++++---------- ...sie.pref => prefer-debian-09-stretch.pref} | 26 ++++++++-------- ...etch.pref => prefer-debian-10-buster.pref} | 22 +++++++------- preferences.d/prefer-debian-11-bullseye.pref | 20 +++++++++++++ ...-stable.pref => prefer-debian-stable.pref} | 2 +- ...sie-src.list => debian-08-jessie-src.list} | 0 .../{jessie.list => debian-08-jessie.list} | 0 ...ch-src.list => debian-09-stretch-src.list} | 2 +- .../{stretch.list => debian-09-stretch.list} | 2 +- sources.list.d/debian-10-buster-src.list | 5 ++++ sources.list.d/debian-10-buster.list | 5 ++++ sources.list.d/debian-11-bullseye-src.list | 5 ++++ sources.list.d/debian-11-bullseye.list | 5 ++++ ...-src.list => debian-experimental-src.list} | 0 ...rimental.list => debian-experimental.list} | 0 .../{sid-src.list => debian-sid-src.list} | 0 sources.list.d/{sid.list => debian-sid.list} | 0 sources.list.d/wheezy-src.list | 5 ---- sources.list.d/wheezy.list | 5 ---- 19 files changed, 82 insertions(+), 52 deletions(-) rename preferences.d/{prefer-wheezy.pref => prefer-debian-08-jessie.pref} (86%) rename preferences.d/{prefer-jessie.pref => prefer-debian-09-stretch.pref} (83%) rename preferences.d/{prefer-stretch.pref => prefer-debian-10-buster.pref} (79%) create mode 100644 preferences.d/prefer-debian-11-bullseye.pref rename preferences.d/{prefer-stable.pref => prefer-debian-stable.pref} (98%) rename sources.list.d/{jessie-src.list => debian-08-jessie-src.list} (100%) rename sources.list.d/{jessie.list => debian-08-jessie.list} (100%) rename sources.list.d/{stretch-src.list => debian-09-stretch-src.list} (79%) rename sources.list.d/{stretch.list => debian-09-stretch.list} (79%) create mode 100644 sources.list.d/debian-10-buster-src.list create mode 100644 sources.list.d/debian-10-buster.list create mode 100644 sources.list.d/debian-11-bullseye-src.list create mode 100644 sources.list.d/debian-11-bullseye.list rename sources.list.d/{experimental-src.list => debian-experimental-src.list} (100%) rename sources.list.d/{experimental.list => debian-experimental.list} (100%) rename sources.list.d/{sid-src.list => debian-sid-src.list} (100%) rename sources.list.d/{sid.list => debian-sid.list} (100%) delete mode 100644 sources.list.d/wheezy-src.list delete mode 100644 sources.list.d/wheezy.list diff --git a/preferences.d/prefer-wheezy.pref b/preferences.d/prefer-debian-08-jessie.pref similarity index 86% rename from preferences.d/prefer-wheezy.pref rename to preferences.d/prefer-debian-08-jessie.pref index d5d41ac..9c2456b 100644 --- a/preferences.d/prefer-wheezy.pref +++ b/preferences.d/prefer-debian-08-jessie.pref @@ -1,39 +1,39 @@ # target-release priorities should be >= 990 (and < 1000) apart from backports -# Debian 7 -Package: * -Pin: release o=Debian,n=wheezy* -Pin-Priority: 990 - -Package: * -Pin: release o=Debian Backports,n=wheezy-backports -Pin-Priority: 980 - # Debian 8 Package: * Pin: release o=Debian,n=jessie* -Pin-Priority: 890 +Pin-Priority: 990 Package: * Pin: release o=Debian Backports,n=jessie-backports -Pin-Priority: 880 +Pin-Priority: 980 # Debian 9 Package: * Pin: release o=Debian,n=stretch* -Pin-Priority: 790 +Pin-Priority: 890 Package: * Pin: release o=Debian Backports,n=stretch-backports -Pin-Priority: 780 +Pin-Priority: 880 # Debian 10 Package: * Pin: release o=Debian,n=buster* -Pin-Priority: 690 +Pin-Priority: 790 Package: * Pin: release o=Debian Backports,n=buster-backports +Pin-Priority: 780 + +# Debian 11 +Package: * +Pin: release o=Debian,n=bullseye* +Pin-Priority: 690 + +Package: * +Pin: release o=Debian Backports,n=bullseye-backports Pin-Priority: 680 # Debian unstable @@ -44,4 +44,4 @@ Pin-Priority: 300 # Debian others (experimental, ...) Package: * Pin: release o=Debian -Pin-Priority: -1 +Pin-Priority: 1 diff --git a/preferences.d/prefer-jessie.pref b/preferences.d/prefer-debian-09-stretch.pref similarity index 83% rename from preferences.d/prefer-jessie.pref rename to preferences.d/prefer-debian-09-stretch.pref index 2c5a820..fc138bd 100644 --- a/preferences.d/prefer-jessie.pref +++ b/preferences.d/prefer-debian-09-stretch.pref @@ -1,30 +1,30 @@ # target-release priorities should be >= 990 (and < 1000) apart from backports -# Debian 8 -Package: * -Pin: release o=Debian,n=jessie* -Pin-Priority: 990 - -Package: * -Pin: release o=Debian Backports,n=jessie-backports -Pin-Priority: 980 - # Debian 9 Package: * Pin: release o=Debian,n=stretch* -Pin-Priority: 890 +Pin-Priority: 990 Package: * Pin: release o=Debian Backports,n=stretch-backports -Pin-Priority: 880 +Pin-Priority: 980 # Debian 10 Package: * Pin: release o=Debian,n=buster* -Pin-Priority: 790 +Pin-Priority: 890 Package: * Pin: release o=Debian Backports,n=buster-backports +Pin-Priority: 880 + +# Debian 11 +Package: * +Pin: release o=Debian,n=bullseye* +Pin-Priority: 790 + +Package: * +Pin: release o=Debian Backports,n=bullseye-backports Pin-Priority: 780 # Debian unstable @@ -35,4 +35,4 @@ Pin-Priority: 300 # Debian others (experimental, ...) Package: * Pin: release o=Debian -Pin-Priority: -1 +Pin-Priority: 1 diff --git a/preferences.d/prefer-stretch.pref b/preferences.d/prefer-debian-10-buster.pref similarity index 79% rename from preferences.d/prefer-stretch.pref rename to preferences.d/prefer-debian-10-buster.pref index 4458dba..785091c 100644 --- a/preferences.d/prefer-stretch.pref +++ b/preferences.d/prefer-debian-10-buster.pref @@ -1,21 +1,21 @@ # target-release priorities should be >= 990 (and < 1000) apart from backports -# Debian 9 -Package: * -Pin: release o=Debian,n=stretch* -Pin-Priority: 990 - -Package: * -Pin: release o=Debian Backports,n=stretch-backports -Pin-Priority: 980 - # Debian 10 Package: * Pin: release o=Debian,n=buster* -Pin-Priority: 890 +Pin-Priority: 990 Package: * Pin: release o=Debian Backports,n=buster-backports +Pin-Priority: 980 + +# Debian 11 +Package: * +Pin: release o=Debian,n=bullseye* +Pin-Priority: 890 + +Package: * +Pin: release o=Debian Backports,n=bullseye-backports Pin-Priority: 880 # Debian unstable @@ -26,4 +26,4 @@ Pin-Priority: 300 # Debian others (experimental, ...) Package: * Pin: release o=Debian -Pin-Priority: -1 +Pin-Priority: 1 diff --git a/preferences.d/prefer-debian-11-bullseye.pref b/preferences.d/prefer-debian-11-bullseye.pref new file mode 100644 index 0000000..9fc7684 --- /dev/null +++ b/preferences.d/prefer-debian-11-bullseye.pref @@ -0,0 +1,20 @@ +# target-release priorities should be >= 990 (and < 1000) apart from backports + +# Debian 11 +Package: * +Pin: release o=Debian,n=bullseye* +Pin-Priority: 990 + +Package: * +Pin: release o=Debian Backports,n=bullseye-backports +Pin-Priority: 980 + +# Debian unstable +Package: * +Pin: release o=Debian,n=sid* +Pin-Priority: 300 + +# Debian others (experimental, ...) +Package: * +Pin: release o=Debian +Pin-Priority: 1 diff --git a/preferences.d/prefer-stable.pref b/preferences.d/prefer-debian-stable.pref similarity index 98% rename from preferences.d/prefer-stable.pref rename to preferences.d/prefer-debian-stable.pref index ad098fe..d4e8649 100644 --- a/preferences.d/prefer-stable.pref +++ b/preferences.d/prefer-debian-stable.pref @@ -41,4 +41,4 @@ Pin-Priority: 400 # Debian others (experimental, ...) Package: * Pin: release o=Debian -Pin-Priority: -1 +Pin-Priority: 1 diff --git a/sources.list.d/jessie-src.list b/sources.list.d/debian-08-jessie-src.list similarity index 100% rename from sources.list.d/jessie-src.list rename to sources.list.d/debian-08-jessie-src.list diff --git a/sources.list.d/jessie.list b/sources.list.d/debian-08-jessie.list similarity index 100% rename from sources.list.d/jessie.list rename to sources.list.d/debian-08-jessie.list diff --git a/sources.list.d/stretch-src.list b/sources.list.d/debian-09-stretch-src.list similarity index 79% rename from sources.list.d/stretch-src.list rename to sources.list.d/debian-09-stretch-src.list index 4266986..04baae7 100644 --- a/sources.list.d/stretch-src.list +++ b/sources.list.d/debian-09-stretch-src.list @@ -2,4 +2,4 @@ deb-src http://ftp.de.debian.org./debian stretch main contri deb-src http://ftp.de.debian.org./debian stretch-updates main contrib non-free deb-src http://ftp.de.debian.org./debian stretch-proposed-updates main contrib non-free deb-src http://security.debian.org./ stretch/updates main contrib non-free -# deb-src http://ftp.de.debian.org./debian stretch-backports main contrib non-free +deb-src http://ftp.de.debian.org./debian stretch-backports main contrib non-free diff --git a/sources.list.d/stretch.list b/sources.list.d/debian-09-stretch.list similarity index 79% rename from sources.list.d/stretch.list rename to sources.list.d/debian-09-stretch.list index 735b8f1..767308e 100644 --- a/sources.list.d/stretch.list +++ b/sources.list.d/debian-09-stretch.list @@ -2,4 +2,4 @@ deb http://ftp.de.debian.org./debian stretch main contri deb http://ftp.de.debian.org./debian stretch-updates main contrib non-free deb http://ftp.de.debian.org./debian stretch-proposed-updates main contrib non-free deb http://security.debian.org./ stretch/updates main contrib non-free -# deb http://ftp.de.debian.org./debian stretch-backports main contrib non-free +deb http://ftp.de.debian.org./debian stretch-backports main contrib non-free diff --git a/sources.list.d/debian-10-buster-src.list b/sources.list.d/debian-10-buster-src.list new file mode 100644 index 0000000..2fd47fa --- /dev/null +++ b/sources.list.d/debian-10-buster-src.list @@ -0,0 +1,5 @@ +deb-src http://ftp.de.debian.org./debian buster main contrib non-free +deb-src http://ftp.de.debian.org./debian buster-updates main contrib non-free +deb-src http://ftp.de.debian.org./debian buster-proposed-updates main contrib non-free +deb-src http://security.debian.org./ buster/updates main contrib non-free +# deb-src http://ftp.de.debian.org./debian buster-backports main contrib non-free diff --git a/sources.list.d/debian-10-buster.list b/sources.list.d/debian-10-buster.list new file mode 100644 index 0000000..31beb1c --- /dev/null +++ b/sources.list.d/debian-10-buster.list @@ -0,0 +1,5 @@ +deb http://ftp.de.debian.org./debian buster main contrib non-free +deb http://ftp.de.debian.org./debian buster-updates main contrib non-free +deb http://ftp.de.debian.org./debian buster-proposed-updates main contrib non-free +deb http://security.debian.org./ buster/updates main contrib non-free +# deb http://ftp.de.debian.org./debian buster-backports main contrib non-free diff --git a/sources.list.d/debian-11-bullseye-src.list b/sources.list.d/debian-11-bullseye-src.list new file mode 100644 index 0000000..aa52f77 --- /dev/null +++ b/sources.list.d/debian-11-bullseye-src.list @@ -0,0 +1,5 @@ +deb-src http://ftp.de.debian.org./debian bullseye main contrib non-free +deb-src http://ftp.de.debian.org./debian bullseye-updates main contrib non-free +deb-src http://ftp.de.debian.org./debian bullseye-proposed-updates main contrib non-free +deb-src http://security.debian.org./ bullseye/updates main contrib non-free +# deb-src http://ftp.de.debian.org./debian bullseye-backports main contrib non-free diff --git a/sources.list.d/debian-11-bullseye.list b/sources.list.d/debian-11-bullseye.list new file mode 100644 index 0000000..bdf1f72 --- /dev/null +++ b/sources.list.d/debian-11-bullseye.list @@ -0,0 +1,5 @@ +deb http://ftp.de.debian.org./debian bullseye main contrib non-free +deb http://ftp.de.debian.org./debian bullseye-updates main contrib non-free +deb http://ftp.de.debian.org./debian bullseye-proposed-updates main contrib non-free +deb http://security.debian.org./ bullseye/updates main contrib non-free +# deb http://ftp.de.debian.org./debian bullseye-backports main contrib non-free diff --git a/sources.list.d/experimental-src.list b/sources.list.d/debian-experimental-src.list similarity index 100% rename from sources.list.d/experimental-src.list rename to sources.list.d/debian-experimental-src.list diff --git a/sources.list.d/experimental.list b/sources.list.d/debian-experimental.list similarity index 100% rename from sources.list.d/experimental.list rename to sources.list.d/debian-experimental.list diff --git a/sources.list.d/sid-src.list b/sources.list.d/debian-sid-src.list similarity index 100% rename from sources.list.d/sid-src.list rename to sources.list.d/debian-sid-src.list diff --git a/sources.list.d/sid.list b/sources.list.d/debian-sid.list similarity index 100% rename from sources.list.d/sid.list rename to sources.list.d/debian-sid.list diff --git a/sources.list.d/wheezy-src.list b/sources.list.d/wheezy-src.list deleted file mode 100644 index 7fd77a4..0000000 --- a/sources.list.d/wheezy-src.list +++ /dev/null @@ -1,5 +0,0 @@ -deb-src http://ftp.de.debian.org./debian wheezy main contrib non-free -deb-src http://ftp.de.debian.org./debian wheezy-updates main contrib non-free -deb-src http://ftp.de.debian.org./debian wheezy-proposed-updates main contrib non-free -deb-src http://security.debian.org./ wheezy/updates main contrib non-free -deb-src http://ftp.de.debian.org./debian wheezy-backports main contrib non-free diff --git a/sources.list.d/wheezy.list b/sources.list.d/wheezy.list deleted file mode 100644 index 7cbef45..0000000 --- a/sources.list.d/wheezy.list +++ /dev/null @@ -1,5 +0,0 @@ -deb http://ftp.de.debian.org./debian wheezy main contrib non-free -deb http://ftp.de.debian.org./debian wheezy-updates main contrib non-free -deb http://ftp.de.debian.org./debian wheezy-proposed-updates main contrib non-free -deb http://security.debian.org./ wheezy/updates main contrib non-free -deb http://ftp.de.debian.org./debian wheezy-backports main contrib non-free