fix: declare conflicts with sway to avoid package installation error.…

… Addresses #18.
regolith-linux · Apr 19, 2024 · df55a2b · SoumyaRanjanPatnaik · Apr 20, 2024 · df55a2b
1 parent 0483a7a
commit df55a2b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+sway-regolith (1.9-4) noble; urgency=medium
+
+  * chore: ignore debian tmp dir
+  * fix: declare conflicts with sway to avoid package installation error.  Addresses https://github.com/regolith-linux/sway-regolith/issues/18.
+
+ -- Regolith Linux <[email protected]>  Fri, 19 Apr 2024 07:47:51 -0700
+
 sway-regolith (1.9-3) noble; urgency=medium
 
   [ Regolith Linux ]

diff --git a/debian/control b/debian/control
@@ -39,6 +39,7 @@ Architecture: any
 Depends: libgl1-mesa-dri, swaybg, policykit-1, libtrawldb, ${misc:Depends}, ${shlibs:Depends}
 Recommends: suckless-tools, sway-backgrounds, foot
 Suggests: swayidle, swaylock, xdg-desktop-portal-wlr
+Conflicts: 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