[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/wayland/weston][debian-experimental] 7 commits: debian/watch: update capitalization

Title: GitLab

Dylan Aïssi pushed to branch debian-experimental 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
  • 1ac1c4d0
    by Jeremy Bícha at 2025-11-09T14:31:35-05:00 
    Increase build test timeout for riscv64

Closes: #1120434
  • ced08354
    by Jeremy Bícha at 2025-11-09T14:32:28-05:00 
    releasing package weston version 14.0.2-5

7 changed files:

Changes:

  • debian/changelog
    1 
    +weston (14.0.2-5) unstable; urgency=high
    2 
    +
    3 
    +  * Team upload
    4 
    +  * Increase build test timeout because of riscv64 (Closes: #1120434)
    5 
    +
    6 
    + -- Jeremy Bícha <jbicha@ubuntu.com>  Sun, 09 Nov 2025 14:31:47 -0500
    7 
    +
    8 
    +weston (14.0.2-4) unstable; urgency=high
    9 
    +
    10 
    +  * Team upload
    11 
    +
    12 
    +  [ Jeremy Bícha ]
    13 
    +  * Cherry-pick patch to allow building with libdisplay-info 0.3
    14 
    +  * Update debian/gbp.conf
    15 
    +
    16 
    +  [ Dylan Aïssi ]
    17 
    +  * Convert watch to version 5 and use Gitlab template
    18 
    +
    19 
    + -- Jeremy Bícha <jbicha@ubuntu.com>  Sun, 09 Nov 2025 07:53:33 -0500
    20 
    +
    1 21 
     weston (14.0.2-3) unstable; urgency=medium
    2 22
    3 23 
       * Upload to unstable.

  • debian/gbp.conf
    1 1 
     [DEFAULT]
    2 2 
     debian-branch = debian-unstable
    3 3 
     upstream-branch = upstream-unstable
    4 
    +pristine-tar = True
    5 
    +
    6 
    +[dch]
    7 
    +multimaint-merge = True
    8 
    +
    9 
    +[pq]
    10 
    +patch-numbers = False

  • debian/patches/Fix-sphinx-8-compatibility.patch
    1 
    -Description: Fix compatibility with sphinx 8.x. Otherwise it FTBFS with:
    2 
    - ERROR: Invalid value `None` in intersphinx_mapping['https://docs.python.org/'].
    1 
    +From: =?utf-8?q?Dylan_A=C3=AFssi?= <daissi@debian.org>
    2 
    +Date: Tue, 16 Sep 2025 13:42:50 +0200
    3 
    +Subject: Fix compatibility with sphinx 8.x. Otherwise it FTBFS with:
    4 
    +
    5 
    +ERROR: Invalid value `None` in intersphinx_mapping['https://docs.python.org/'].
    6 
    +
    3 7 
     Forwarded: not-needed
    4 8 
     Origin: upstream, https://gitlab.freedesktop.org/wayland/weston/-/commit/a40c6380
    9 
    +---
    10 
    + doc/sphinx/conf.py.in | 2 +-
    11 
    + 1 file changed, 1 insertion(+), 1 deletion(-)
    5 12
    13 
    +diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
    14 
    +index a08ab1f..7fff85a 100644
    6 15 
     --- a/doc/sphinx/conf.py.in
    7 16 
     +++ b/doc/sphinx/conf.py.in
    8 
    -@@ -196,7 +196,7 @@
    17 
    +@@ -196,7 +196,7 @@ epub_exclude_files = ['search.html']
    9 18 
      # -- Options for intersphinx extension ---------------------------------------
    10 19
    11 20 
      # Example configuration for intersphinx: refer to the Python standard library.

  • debian/patches/build-Allow-libdisplay-info-0.3.0.patch
    1 
    +From: Philipp Zabel <p.zabel@pengutronix.de>
    2 
    +Date: Wed, 13 Aug 2025 15:23:39 +0200
    3 
    +Subject: build: Allow libdisplay-info 0.3.0
    4 
    +
    5 
    +There are no breaking changes for the high-level API that Weston uses.
    6 
    +
    7 
    +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
    8 
    +(cherry picked from commit 683eabb61ec43a270f2e3ed67c63bbe3754b1214)
    9 
    +
    10 
    +Origin: upstream, after 14.0.2
    11 
    +---
    12 
    + libweston/backend-drm/meson.build | 2 +-
    13 
    + 1 file changed, 1 insertion(+), 1 deletion(-)
    14 
    +
    15 
    +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build
    16 
    +index 002669e..a8f2ea5 100644
    17 
    +--- a/libweston/backend-drm/meson.build
    18 
    ++++ b/libweston/backend-drm/meson.build
    19 
    +@@ -4,7 +4,7 @@ endif
    20 
    +
    21 
    + dep_libdisplay_info = dependency(
    22 
    + 	'libdisplay-info',
    23 
    +-	version: ['>= 0.1.1', '< 0.3.0'],
    24 
    ++	version: ['>= 0.1.1', '< 0.4.0'],
    25 
    + 	fallback: ['display-info', 'di_dep'],
    26 
    + 	default_options: [
    27 
    + 		'werror=false',

  • debian/patches/series
    1 1 
     Fix-sphinx-8-compatibility.patch
    2 
    +build-Allow-libdisplay-info-0.3.0.patch

  • debian/rules
    ... ... @@ -28,7 +28,7 @@ override_dh_auto_test:
    28 28 
     # Only make tests fatal for a subset of architectures
    29 29 
     # https://gitlab.freedesktop.org/wayland/weston/-/issues/739
    30 30 
     ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 ppc64el riscv64))
    31 
    -	XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test
    31 
    +	XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test --  --timeout-multiplier 3
    32 32 
     else
    33 33 
     	XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test || true
    34 34 
     endif

  • debian/watch
    1 1 
     Version: 5
    2 2
    3 
    -Template: Gitlab
    3 
    +Template: GitLab
    4 4 
     Dist: https://gitlab.freedesktop.org/wayland/weston

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help Notification message regarding https://salsa.debian.org/xorg-team/wayland/weston/-/compare/9e53cf78d6b77a21bc1c18c7e0001eb31da14ee5...ced08354fe28d23cf8bd1cad4332e37b0359c5ad at 1766397326

    Reply to: