diff options
| -rw-r--r-- | debian/_buildscripts/local/additional_files/etc/pbuilderrc | 12 | ||||
| -rw-r--r-- | debian/_buildscripts/local/internals/distro_list.txt | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index 6e9d9d8f1..369d2ff16 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -52,7 +52,7 @@ case "$DISTRIBUTION" in fi ;; - sid|buster|stretch|wheezy) + sid|bullseye|buster|stretch|wheezy) COMPONENTS="main contrib non-free" ;; @@ -62,7 +62,7 @@ case "$DISTRIBUTION" in EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring" ;; - cosmic|bionic|artful|xenial|trusty|precise) + eoan|disco|cosmic|bionic|artful|xenial|trusty|precise) COMPONENTS="main restricted universe multiverse" DEBOOTSTRAPOPTS=(--variant=buildd) ;; @@ -84,7 +84,7 @@ case "$DISTRIBUTION" in fi ;; - sid|buster|stretch) + sid|bullseye|buster|stretch) MIRRORSITE=http://deb.debian.org/debian ;; @@ -96,7 +96,7 @@ case "$DISTRIBUTION" in MIRRORSITE=http://auto.mirror.devuan.org/merged ;; - cosmic|bionic|artful|xenial|trusty|precise) + eoan|disco|cosmic|bionic|artful|xenial|trusty|precise) if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then MIRRORSITE=http://archive.ubuntu.com/ubuntu else @@ -138,10 +138,10 @@ fi #-- apt is better if target distribution contains apt >= 1.4~beta3 #-- aptitude is better if target distribution contains apt < 1.4~beta3 case "$DISTRIBUTION" in - sid|buster|stretch|\ + sid|bullseye|buster|stretch|\ ceres|beowulf|ascii|\ raspbian-buster|raspbian-stretch|\ - cosmic|bionic|artful) + eoan|disco|cosmic|bionic|artful) PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" ;; diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt index 71d1c60b1..d1961791e 100644 --- a/debian/_buildscripts/local/internals/distro_list.txt +++ b/debian/_buildscripts/local/internals/distro_list.txt @@ -14,17 +14,18 @@ DISTROS=" debian 7.0 wheezy '' '' debian 8.0 jessie '' '' debian 9.0 stretch '' '' - debian 10.0 buster ~a '' - debian 11.0 sid ~b '' + debian 10.0 buster '' '' + debian 11.0 bullseye ~a '' + debian 12.0 sid ~b '' # -- devuan -- devuan 1.0 jessie '' debian/jessie devuan 2.0 ascii '' debian/stretch devuan 3.0 beowulf ~a debian/buster devuan 4.0 ceres ~b debian/sid # -- raspbian -- - raspbian 7.0 raspbian-wheezy '' '' raspbian 8.0 raspbian-jessie '' '' raspbian 9.0 raspbian-stretch '' '' + raspbian 10.0 raspbian-buster ~a '' # -- ubuntu -- ubuntu 12.04 precise '' '' ubuntu 14.04 trusty '' '' @@ -32,5 +33,6 @@ DISTROS=" ubuntu 17.10 artful '' '' ubuntu 18.04 bionic '' '' ubuntu 18.10 cosmic '' '' - ubuntu 19.04 disco ~a '' + ubuntu 19.04 disco '' '' + ubuntu 19.10 eoan ~a '' " |