diff --git a/debian/changelog b/debian/changelog index aa1c96edf6..9389145fd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sway-regolith (1.9-14) 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 ] diff --git a/debian/control b/debian/control index bd6e9ac705..ee48f3f3f9 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,29 @@ 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-regolith-supplemental | sway (>= 1.9), + ${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} +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. 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