Package: release.debian.org Control: affects -1 + src:meta-phosh User: [email protected] Usertags: unblock Severity: normal
Please unblock package meta-phosh [ Reason ] Currently there's a `Recommends: xwayland` on phoc (the Wayland compositor) that pulls in xwayland. However we should have a hard dependency for the full phosh DE install so add it to the phosh-full package. Otherwise people might remove it and wonder why X11 apps aren't working. [ Impact ] A package that is installed by default via Recommends: is added as a hard dependency. [ Tests ] piuparts tests the installation/removal. [ Risks ] Low as it doesn't pull in anything new, just ensures it doesn't get removed accidentally. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing unblock meta-phosh/46.1
diff --git a/debian/changelog b/debian/changelog index 9ad1380..f2404a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +meta-phosh (46.1) unstable; urgency=medium + + * phosh-full: Depend on xwayland. + It comes in via phoc anyway but this ensures a full blown installation + has it. + * Check wrap-and-sort in CI + + -- Guido Günther <[email protected]> Fri, 30 May 2025 14:24:09 +0200 + meta-phosh (46) unstable; urgency=medium * Use phrog instead of phog. diff --git a/debian/control b/debian/control index 610ed5a..187d02b 100644 --- a/debian/control +++ b/debian/control @@ -56,9 +56,9 @@ Recommends: iio-sensor-proxy, libjxl-gdk-pixbuf, libproxy1-plugin-networkmanager [linux-any], - phrog, phosh-mobile-settings (>= 0.44~), phosh-tour (>= 0.43.0), + phrog, sound-theme-phosh (>= 0.42.0), xdg-desktop-portal-gtk, xdg-desktop-portal-wlr, @@ -147,6 +147,7 @@ Depends: lollypop, phosh-core (= ${binary:Version}), phosh-pim (= ${binary:Version}), + xwayland, ${misc:Depends}, Recommends: chatty, diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 5e6658d..69202db 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -3,3 +3,6 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +variables: + SALSA_CI_DISABLE_WRAP_AND_SORT: 0 + SALSA_CI_WRAP_AND_SORT_ARGS: '-ast'
