Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-13 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mk-sbuild' of git+ssh://git.launchpad.net/~myamada/ubuntu-dev-tools

Browse Source 
Closes: #1001832
LP: #1955116
MR: https://code.launchpad.net/~myamada/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/435734
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
This commit is contained in:
Mattia Rizzolo 2023-01-14 18:49:29 +01:00
commit 844d6d942c
No known key found for this signature in database
GPG Key ID: 0816B9E18C762BAD
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -9,6 +9,11 @@ ubuntu-dev-tools (0.192) UNRELEASED; urgency=medium
* Demote bzr/brz from Recommends to Suggests, as nowadays git is the way. * Demote bzr/brz from Recommends to Suggests, as nowadays git is the way.
Closes: #940531 Closes: #940531
[ Masahiro Yamada ]
* mk-sbuild:
+ Handle the new location of the Debian bullseye security archive.
Closes: #1001832; LP: #1955116
-- Mattia Rizzolo <mattia@debian.org> Tue, 11 Oct 2022 13:57:46 +0200 -- Mattia Rizzolo <mattia@debian.org> Tue, 11 Oct 2022 13:57:46 +0200
ubuntu-dev-tools (0.191) unstable; urgency=medium ubuntu-dev-tools (0.191) unstable; urgency=medium

52
mk-sbuild
View File

@ -397,29 +397,41 @@ fi
# By default DEBOOTSTRAP_SCRIPT must match RELEASE # By default DEBOOTSTRAP_SCRIPT must match RELEASE
DEBOOTSTRAP_SCRIPT="$RELEASE" DEBOOTSTRAP_SCRIPT="$RELEASE"
if [ "$DISTRO" = "ubuntu" ]; then dist_ge() {
ubuntu_dist_ge() { local releases="$($3-distro-info --all)"
local releases="$(ubuntu-distro-info --all)" local left=999
local left=999 local right=0
local right=0 local seq=1
local seq=1
for i in $releases; do for i in $releases; do
if [ $1 = $i ]; then if [ $1 = $i ]; then
local left=$seq local left=$seq
break break
fi fi
seq=$((seq+1)) seq=$((seq+1))
done done
seq=1
for i in $releases; do seq=1
for i in $releases; do
if [ $2 = $i ]; then if [ $2 = $i ]; then
local right=$seq local right=$seq
break break
fi fi
seq=$((seq+1)) seq=$((seq+1))
done done
[ $left -ge $right ] && return 0 || return 1
} [ $left -ge $right ] && return 0 || return 1
}
ubuntu_dist_ge () {
dist_ge $1 $2 ubuntu
}
debian_dist_ge () {
dist_ge $1 $2 debian
}
if [ "$DISTRO" = "ubuntu" ]; then
# On Ubuntu, set DEBOOTSTRAP_SCRIPT to gutsy to allow building new RELEASES without new debootstrap # On Ubuntu, set DEBOOTSTRAP_SCRIPT to gutsy to allow building new RELEASES without new debootstrap
DEBOOTSTRAP_SCRIPT=gutsy DEBOOTSTRAP_SCRIPT=gutsy
fi fi
@ -663,7 +675,11 @@ debian)
# Debian only performs security updates # Debian only performs security updates
SKIP_UPDATES=1 SKIP_UPDATES=1
if [ -z "$SOURCES_SECURITY_SUITE" ]; then if [ -z "$SOURCES_SECURITY_SUITE" ]; then
SOURCES_SECURITY_SUITE="RELEASE/updates" if debian_dist_ge "$RELEASE" "bullseye"; then
SOURCES_SECURITY_SUITE="RELEASE-security"
else
SOURCES_SECURITY_SUITE="RELEASE/updates"
fi
fi fi
if [ -z "$SOURCES_SECURITY_URL" ]; then if [ -z "$SOURCES_SECURITY_URL" ]; then
SOURCES_SECURITY_URL="http://security.debian.org/" SOURCES_SECURITY_URL="http://security.debian.org/"