Module: tools Branch: master Commit: db6817f62d03f5c51bf1b49c7294a465ae017e8d URL: https://source.winehq.org/git/tools.git/?a=commit;h=db6817f62d03f5c51bf1b49c...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Oct 8 21:04:58 2021 +0200
packaging: Allow specifying the build id for Debian packages.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
packaging/obs/obs-sync | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index d3bb585..c74b7fe 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -70,14 +70,14 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver~${2}-1_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver~${2}-1_$arch.deb $dstdir/binary-$arch/ + rsync -aq $obsdir/$arch/${wine_pkg}_$debver~${2}-${build}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver~${2}-${build}_$arch.deb $dstdir/binary-$arch/ done - dscverify -u $obsdir/$source_pkg~$2-1.dsc - if test -f $obsdir/$source_pkg~$2-1.diff.gz + dscverify -u $obsdir/$source_pkg~$2-$build.dsc + if test -f $obsdir/$source_pkg~$2-$build.diff.gz then - rsync -aq $obsdir/$source_pkg~$2-1.dsc $obsdir/$source_pkg~$2-1.diff.gz $obsdir/$source_pkg~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg~$2-$build.dsc $obsdir/$source_pkg~$2-$build.diff.gz $obsdir/$source_pkg~$2.orig.tar.gz $dstdir/source/ else - rsync -aq $obsdir/$source_pkg~$2-1.dsc $obsdir/$source_pkg~$2-1.debian.tar.xz $obsdir/$source_pkg~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg~$2-$build.dsc $obsdir/$source_pkg~$2-$build.debian.tar.xz $obsdir/$source_pkg~$2.orig.tar.gz $dstdir/source/ fi
if test -n "$4" @@ -181,10 +181,15 @@ cd $basedir
distros="33 34 buster bullseye bookworm bionic focal hirsute" dry_run= +build=1
while [ $# -ge 1 ] do case "$1" in + -b) + build="$2" + shift + ;; -d) distros="$2" shift