Module: tools Branch: master Commit: a86d8d25f72d64b4d50ac2d18e166c8594d1a0d8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a86d8d25f72d64b4d50ac2d1... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 9 08:43:12 2022 +0200 packaging: Add Ubuntu 22.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/apt-override | 1 + packaging/obs/obs-sync | 7 ++++--- packaging/obs/rsync-filter | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 079a68a..613acb9 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -38,4 +38,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_2... ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_2... ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_2... ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_2... ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_2... ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/apt-override b/packaging/obs/apt-override index 8e82e55..45eb6a3 100644 --- a/packaging/obs/apt-override +++ b/packaging/obs/apt-override @@ -1,2 +1,3 @@ wine otherosfs wine-staging otherosfs +vkd3d otherosfs diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index b0ec672..9a063cd 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -80,9 +80,9 @@ add_deb () 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-$build.dsc $obsdir/$source_pkg\~$2-$build.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.[gx]z $dstdir/source/ else - 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/ + rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.[gx]z $dstdir/source/ fi if test -n "$4" @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="34 35 buster bullseye bookworm bionic focal impish" +distros="34 35 buster bullseye bookworm bionic focal impish jammy" dry_run= build=1 @@ -244,6 +244,7 @@ do bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; impish) add_deb ubuntu $i xUbuntu_21.10 ;; + jammy) add_deb ubuntu $i xUbuntu_22.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 7b8299e..4d818b3 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -19,6 +19,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/impish ++ /ubuntu/dists/jammy - /ubuntu/dists/* - /ubuntu/*