[Build-System] Use unique .orig.tar.xz filenames across different Debian distributions. Update Debian distributions since stable is Trixie now. Use codename instead of suite when generating the distribution field in .changes files. (#2953)

This commit is contained in:
Andrey Volk
2025-11-21 17:47:45 +03:00
committed by GitHub
parent 4c93f3ce2b
commit 418edb8e2b
19 changed files with 279 additions and 269 deletions

22
debian/util.sh vendored
View File

@@ -46,10 +46,10 @@ find_distro () {
case "$1" in
experimental) echo "sid";;
unstable) echo "sid";;
testing) echo "trixie";;
stable) echo "bookworm";;
oldstable) echo "bullseye";;
oldoldstable) echo "buster";;
stable) echo "trixie";;
oldstable) echo "bookworm";;
oldoldstable) echo "bullseye";;
oldoldoldstable) echo "buster";;
*) echo "$1";;
esac
}
@@ -57,10 +57,10 @@ find_distro () {
find_suite () {
case "$1" in
sid) echo "unstable";;
trixie) echo "testing";;
bookworm) echo "stable";;
bullseye) echo "oldstable";;
buster) echo "oldoldstable";;
trixie) echo "stable";;
bookworm) echo "oldstable";;
bullseye) echo "oldoldstable";;
buster) echo "oldoldoldstable";;
*) echo "$1";;
esac
}
@@ -210,8 +210,8 @@ create_orig () {
orig="../freeswitch_$(debian/version-omit_revision.pl).orig.tar.xz"
git_archive_prefix="freeswitch/"
else
orig="../freeswitch_$(mk_dver "$uver")~$(lsb_release -sc).orig.tar.xz"
git_archive_prefix="freeswitch-$uver/"
orig="../freeswitch_${uver}~$(lsb_release -sc)~$(dpkg-architecture -qDEB_BUILD_ARCH).orig.tar.xz"
git_archive_prefix="freeswitch/"
fi
mv .gitattributes .gitattributes.orig
@@ -360,7 +360,7 @@ create_dsc () {
[ "$zl" -ge "1" ] || zl=1
dch -b -m -v "$dver" --force-distribution -D "$suite" "Nightly build."
dch -b -m -v "$dver" --force-distribution -D "$distro" "Nightly build."
git add debian/rules debian/changelog && git commit -m "nightly v$orig_ver"