Jeremy Bícha pushed to branch debian-unstable at X Strike Force / wayland / weston
Commits: 74e78aa6 by Jeremy Bícha at 2025-11-09T07:40:09-05:00 debian/watch: update capitalization Gbp-Dch: Ignore - - - - - b36159cc by Jeremy Bícha at 2025-11-09T07:46:08-05:00 Refresh patch - - - - - 456940b2 by Jeremy Bícha at 2025-11-09T07:47:12-05:00 Cherry-pick patch to allow building with libdisplay-info 0.3 - - - - - d24d564f by Jeremy Bícha at 2025-11-09T07:48:20-05:00 Update debian/gbp.conf This also helps bypass debian/.gitignore for adding patches - - - - - bdfab70f by Jeremy Bícha at 2025-11-09T07:55:27-05:00 releasing package weston version 14.0.2-4 - - - - - 6 changed files: - debian/changelog - debian/gbp.conf - debian/patches/Fix-sphinx-8-compatibility.patch - + debian/patches/build-Allow-libdisplay-info-0.3.0.patch - debian/patches/series - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +weston (14.0.2-4) unstable; urgency=high + + * Team upload + + [ Jeremy Bícha ] + * Cherry-pick patch to allow building with libdisplay-info 0.3 + * Update debian/gbp.conf + + [ Dylan Aïssi ] + * Convert watch to version 5 and use Gitlab template + + -- Jeremy Bícha <[email protected]> Sun, 09 Nov 2025 07:53:33 -0500 + weston (14.0.2-3) unstable; urgency=medium * Upload to unstable. ===================================== debian/gbp.conf ===================================== @@ -1,3 +1,10 @@ [DEFAULT] debian-branch = debian-unstable upstream-branch = upstream-unstable +pristine-tar = True + +[dch] +multimaint-merge = True + +[pq] +patch-numbers = False ===================================== debian/patches/Fix-sphinx-8-compatibility.patch ===================================== @@ -1,11 +1,20 @@ -Description: Fix compatibility with sphinx 8.x. Otherwise it FTBFS with: - ERROR: Invalid value `None` in intersphinx_mapping['https://docs.python.org/']. +From: =?utf-8?q?Dylan_A=C3=AFssi?= <[email protected]> +Date: Tue, 16 Sep 2025 13:42:50 +0200 +Subject: Fix compatibility with sphinx 8.x. Otherwise it FTBFS with: + +ERROR: Invalid value `None` in intersphinx_mapping['https://docs.python.org/']. + Forwarded: not-needed Origin: upstream, https://gitlab.freedesktop.org/wayland/weston/-/commit/a40c6380 +--- + doc/sphinx/conf.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in +index a08ab1f..7fff85a 100644 --- a/doc/sphinx/conf.py.in +++ b/doc/sphinx/conf.py.in -@@ -196,7 +196,7 @@ +@@ -196,7 +196,7 @@ epub_exclude_files = ['search.html'] # -- Options for intersphinx extension --------------------------------------- # Example configuration for intersphinx: refer to the Python standard library. ===================================== debian/patches/build-Allow-libdisplay-info-0.3.0.patch ===================================== @@ -0,0 +1,27 @@ +From: Philipp Zabel <[email protected]> +Date: Wed, 13 Aug 2025 15:23:39 +0200 +Subject: build: Allow libdisplay-info 0.3.0 + +There are no breaking changes for the high-level API that Weston uses. + +Signed-off-by: Philipp Zabel <[email protected]> +(cherry picked from commit 683eabb61ec43a270f2e3ed67c63bbe3754b1214) + +Origin: upstream, after 14.0.2 +--- + libweston/backend-drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 002669e..a8f2ea5 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build +@@ -4,7 +4,7 @@ endif + + dep_libdisplay_info = dependency( + 'libdisplay-info', +- version: ['>= 0.1.1', '< 0.3.0'], ++ version: ['>= 0.1.1', '< 0.4.0'], + fallback: ['display-info', 'di_dep'], + default_options: [ + 'werror=false', ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ Fix-sphinx-8-compatibility.patch +build-Allow-libdisplay-info-0.3.0.patch ===================================== debian/watch ===================================== @@ -1,4 +1,4 @@ Version: 5 -Template: Gitlab +Template: GitLab Dist: https://gitlab.freedesktop.org/wayland/weston View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/compare/9e53cf78d6b77a21bc1c18c7e0001eb31da14ee5...bdfab70f38287b135bad154e5d11115e1f9218d8 -- View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/compare/9e53cf78d6b77a21bc1c18c7e0001eb31da14ee5...bdfab70f38287b135bad154e5d11115e1f9218d8 You're receiving this email because of your account on salsa.debian.org.
