Module: tools Branch: master Commit: 462984471bb2728275708850cfd355eb0e28334a URL: https://source.winehq.org/git/tools.git/?a=commit;h=462984471bb2728275708850...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 25 21:44:56 2021 +0200
packaging: Add Ubuntu 21.10.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 15 ++++++++------- packaging/obs/rsync-filter | 1 + 3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index b8b7c61..186f65a 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/obs-sync b/packaging/obs/obs-sync index 0691425..b33bbd3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files ()
cd $basedir
-distros="33 34 35 buster bullseye bookworm bionic focal hirsute" +distros="33 34 35 buster bullseye bookworm bionic focal hirsute impish" dry_run= build=1
@@ -238,12 +238,13 @@ do do case $i in 3?) add_rpm $i Fedora_$i ;; - buster) add_deb debian buster Debian_10 oldstable ;; - bullseye) add_deb debian bullseye Debian_11 stable ;; - bookworm) add_deb debian bookworm Debian_Testing_standard testing ;; - bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; - focal) add_deb ubuntu focal xUbuntu_20.04 ;; - hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; + buster) add_deb debian $i Debian_10 oldstable ;; + bullseye) add_deb debian $i Debian_11 stable ;; + bookworm) add_deb debian $i Debian_Testing_standard testing ;; + bionic) add_deb ubuntu $i xUbuntu_18.04 ;; + focal) add_deb ubuntu $i xUbuntu_20.04 ;; + hirsute) add_deb ubuntu $i xUbuntu_21.04 ;; + impish) add_deb ubuntu $i xUbuntu_21.10 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 6d9f1a4..8940d8b 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -20,6 +20,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/hirsute ++ /ubuntu/dists/impish - /ubuntu/dists/* - /ubuntu/*