From e8c3b50e8780b0aa8800b2bafa60f4fa47748314 Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sat, 18 May 2024 08:24:29 -0700 Subject: [PATCH 01/10] fix: isolate files shared with upstream in supplemental package --- debian/control | 26 ++++++++++++++++------- debian/sway-regolith-supplemental.install | 4 ++++ debian/sway-regolith.install | 1 + 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 debian/sway-regolith-supplemental.install create mode 100644 debian/sway-regolith.install diff --git a/debian/control b/debian/control index bd6e9ac705..b8256a348f 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,7 @@ Source: sway-regolith Section: x11 Priority: optional -Maintainer: Sway and related packages team -Uploaders: Birger Schacht , - nicoo +Maintainer: Regolith Desktop Build-Depends: debhelper-compat (= 13), libcairo2-dev, libcap-dev, @@ -29,19 +27,31 @@ Build-Depends: debhelper-compat (= 13), tree, wayland-protocols (>= 1.24) Standards-Version: 4.6.1.0 -Homepage: http://swaywm.org -Vcs-Browser: https://salsa.debian.org/swaywm-team/sway -Vcs-Git: https://salsa.debian.org/swaywm-team/sway.git Rules-Requires-Root: no Package: sway-regolith Architecture: any -Depends: libgl1-mesa-dri, swaybg, policykit-1, libtrawldb, ${misc:Depends}, ${shlibs:Depends} +Depends: + libgl1-mesa-dri, + swaybg, + polkitd, + libtrawldb, + sway (>= 1.9) | sway-regolith-supplemental, + ${misc:Depends}, + ${shlibs:Depends} Suggests: xdg-desktop-portal-wlr -Provides: sway Description: i3-compatible Wayland compositor for the Regolith desktop environment sway (SirCmpwn's Wayland compositor) is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your existing i3 configuration and supports most of i3's features, plus a few extras. This means it is a minimalist, tiling window manager. This variant supports trawl integration. + +Package: sway-regolith-supplemental +Architecture: any +Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} +Provides: sway +Conflicts: sway +Replaces: sway +Description: Support files that may also come from upstream package + These files are required for sway to function but may be provided by upstream. \ No newline at end of file diff --git a/debian/sway-regolith-supplemental.install b/debian/sway-regolith-supplemental.install new file mode 100644 index 0000000000..b8cd2bf448 --- /dev/null +++ b/debian/sway-regolith-supplemental.install @@ -0,0 +1,4 @@ +usr/bin/swaybar +usr/bin/swaymsg +usr/bin/swaynag +usr/share/ \ No newline at end of file diff --git a/debian/sway-regolith.install b/debian/sway-regolith.install new file mode 100644 index 0000000000..59ac6c1af5 --- /dev/null +++ b/debian/sway-regolith.install @@ -0,0 +1 @@ +usr/bin/sway-regolith \ No newline at end of file From c328788fd6eae9996105f2e3f949c27edf39eadc Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sat, 18 May 2024 08:47:49 -0700 Subject: [PATCH 02/10] chore: Package changes --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa1c96edf6..9b4e09a3c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sway-regolith (1.9-6) noble; urgency=medium + + * fix: isolate files shared with upstream in supplemental package + + -- Regolith Linux Sat, 18 May 2024 08:47:20 -0700 + sway-regolith (1.9-5) noble; urgency=medium [ Soumya Ranjan Patnaik ] From f76f4761869b52165e0d75f519789598d587089a Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sat, 18 May 2024 11:34:01 -0700 Subject: [PATCH 03/10] experiement: see if ordering and priority impact package solver --- debian/changelog | 2 +- debian/control | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b4e09a3c4..a8acddb4ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-6) noble; urgency=medium +sway-regolith (1.9-7) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index b8256a348f..b35e34f5be 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Depends: swaybg, polkitd, libtrawldb, - sway (>= 1.9) | sway-regolith-supplemental, + sway-regolith-supplemental | sway (>= 1.9), ${misc:Depends}, ${shlibs:Depends} Suggests: xdg-desktop-portal-wlr @@ -49,6 +49,7 @@ Description: i3-compatible Wayland compositor for the Regolith desktop environme Package: sway-regolith-supplemental Architecture: any +Priority: standard Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} Provides: sway Conflicts: sway From 886b7decf68aa243c0a84846392bedf9771ccbff Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sat, 18 May 2024 11:59:03 -0700 Subject: [PATCH 04/10] experiement: see if ordering and priority impact package solver II --- debian/changelog | 2 +- debian/control | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8acddb4ee..75b4c9d696 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-7) noble; urgency=medium +sway-regolith (1.9-8) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index b35e34f5be..d9e1ebd841 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,6 @@ Description: i3-compatible Wayland compositor for the Regolith desktop environme Package: sway-regolith-supplemental Architecture: any -Priority: standard Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} Provides: sway Conflicts: sway From f4dee474819c10b447d127f8cfe52e55f86c24df Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sat, 18 May 2024 12:14:15 -0700 Subject: [PATCH 05/10] experiement: see if ordering and priority impact package solver III --- debian/changelog | 2 +- debian/control | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 75b4c9d696..8440c9c3a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-8) noble; urgency=medium +sway-regolith (1.9-9) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index d9e1ebd841..b35e34f5be 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,7 @@ Description: i3-compatible Wayland compositor for the Regolith desktop environme Package: sway-regolith-supplemental Architecture: any +Priority: standard Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} Provides: sway Conflicts: sway From 2551fecba2ea96cd8c8ec362782197bbf0714583 Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 19 May 2024 11:00:02 -0700 Subject: [PATCH 06/10] experiment: add meta packags to control package selection. Try adding recommends for internal package to see if impacts resolver --- debian/changelog | 2 +- debian/control | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8440c9c3a2..bea6ba73db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-9) noble; urgency=medium +sway-regolith (1.9-10) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index b35e34f5be..b18ceda0db 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,8 @@ Depends: sway-regolith-supplemental | sway (>= 1.9), ${misc:Depends}, ${shlibs:Depends} +Recommends: + sway-regolith-supplemental Suggests: xdg-desktop-portal-wlr Description: i3-compatible Wayland compositor for the Regolith desktop environment sway (SirCmpwn's Wayland compositor) is a tiling Wayland compositor and a @@ -55,4 +57,18 @@ Provides: sway Conflicts: sway Replaces: sway Description: Support files that may also come from upstream package - These files are required for sway to function but may be provided by upstream. \ No newline at end of file + These files are required for sway to function but may be provided by upstream. + +Package: sway-regolith-standalone +Architecture: any +Priority: standard +Depends: sway-regolith, sway-regolith-supplemental, ${misc:Depends}, ${shlibs:Depends} +Description: Meta package for Regolith's Sway variant. + This meta package is for systems that do not use baseline Sway. + +Package: sway-regolith-hybrid +Architecture: any +Priority: standard +Depends: sway-regolith, sway, ${misc:Depends}, ${shlibs:Depends} +Description: Meta package for Regolith's Sway variant. + This meta package is for systems that also have baseline Sway installed. From 33274bc490174e9440364324450250a14fd99b6c Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 19 May 2024 12:27:40 -0700 Subject: [PATCH 07/10] experiement: downgrade association to internal package from Recommends to Suggests to see if that causes resolver to choose not to uninstall sway when installing session package --- debian/changelog | 2 +- debian/control | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bea6ba73db..2d96c7f519 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-10) noble; urgency=medium +sway-regolith (1.9-11) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index b18ceda0db..f19228a074 100644 --- a/debian/control +++ b/debian/control @@ -39,9 +39,7 @@ Depends: sway-regolith-supplemental | sway (>= 1.9), ${misc:Depends}, ${shlibs:Depends} -Recommends: - sway-regolith-supplemental -Suggests: xdg-desktop-portal-wlr +Suggests: xdg-desktop-portal-wlr, sway-regolith-supplemental Description: i3-compatible Wayland compositor for the Regolith desktop environment sway (SirCmpwn's Wayland compositor) is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your From 2214b4a71c8c597524db341234af5e58e6a0237b Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 19 May 2024 13:34:13 -0700 Subject: [PATCH 08/10] experiement: clean up priority. tweaks to package metadata --- debian/changelog | 2 +- debian/control | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d96c7f519..c68c0df4ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-11) noble; urgency=medium +sway-regolith (1.9-12) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index f19228a074..798baa2bca 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Depends: sway-regolith-supplemental | sway (>= 1.9), ${misc:Depends}, ${shlibs:Depends} -Suggests: xdg-desktop-portal-wlr, sway-regolith-supplemental +Suggests: xdg-desktop-portal-wlr Description: i3-compatible Wayland compositor for the Regolith desktop environment sway (SirCmpwn's Wayland compositor) is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your @@ -49,24 +49,19 @@ Description: i3-compatible Wayland compositor for the Regolith desktop environme Package: sway-regolith-supplemental Architecture: any -Priority: standard Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} -Provides: sway Conflicts: sway -Replaces: sway Description: Support files that may also come from upstream package These files are required for sway to function but may be provided by upstream. Package: sway-regolith-standalone Architecture: any -Priority: standard Depends: sway-regolith, sway-regolith-supplemental, ${misc:Depends}, ${shlibs:Depends} Description: Meta package for Regolith's Sway variant. This meta package is for systems that do not use baseline Sway. Package: sway-regolith-hybrid Architecture: any -Priority: standard Depends: sway-regolith, sway, ${misc:Depends}, ${shlibs:Depends} Description: Meta package for Regolith's Sway variant. This meta package is for systems that also have baseline Sway installed. From 797a27cf23cb37d8153ad2a29b54dffd717c882e Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 19 May 2024 13:52:58 -0700 Subject: [PATCH 09/10] experiement: more tweaks, remove meta packages --- debian/changelog | 2 +- debian/control | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index c68c0df4ca..0cb7b91e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-12) noble; urgency=medium +sway-regolith (1.9-13) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index 798baa2bca..ab3dcdabfe 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Depends: sway-regolith-supplemental | sway (>= 1.9), ${misc:Depends}, ${shlibs:Depends} -Suggests: xdg-desktop-portal-wlr +Suggests: xdg-desktop-portal-wlr, sway-regolith-supplemental Description: i3-compatible Wayland compositor for the Regolith desktop environment sway (SirCmpwn's Wayland compositor) is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your @@ -53,15 +53,3 @@ Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} Conflicts: sway Description: Support files that may also come from upstream package These files are required for sway to function but may be provided by upstream. - -Package: sway-regolith-standalone -Architecture: any -Depends: sway-regolith, sway-regolith-supplemental, ${misc:Depends}, ${shlibs:Depends} -Description: Meta package for Regolith's Sway variant. - This meta package is for systems that do not use baseline Sway. - -Package: sway-regolith-hybrid -Architecture: any -Depends: sway-regolith, sway, ${misc:Depends}, ${shlibs:Depends} -Description: Meta package for Regolith's Sway variant. - This meta package is for systems that also have baseline Sway installed. From 77dbff6ce253cd57ce79438c2dc9f36acc080234 Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 19 May 2024 14:10:32 -0700 Subject: [PATCH 10/10] experiement: remove non-working metadata from package --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0cb7b91e6e..9389145fd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sway-regolith (1.9-13) noble; urgency=medium +sway-regolith (1.9-14) noble; urgency=medium * fix: isolate files shared with upstream in supplemental package diff --git a/debian/control b/debian/control index ab3dcdabfe..ee48f3f3f9 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Depends: sway-regolith-supplemental | sway (>= 1.9), ${misc:Depends}, ${shlibs:Depends} -Suggests: xdg-desktop-portal-wlr, sway-regolith-supplemental +Suggests: xdg-desktop-portal-wlr Description: i3-compatible Wayland compositor for the Regolith desktop environment sway (SirCmpwn's Wayland compositor) is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your