Skip to content

Commit a15d2ff

Browse files
authored
Merge pull request #52 from regolith-linux/fix/control-center-conflict
fix: cause conflicts on control center packages so only one can be in…
2 parents fee520c + 0eca398 commit a15d2ff

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

debian/changelog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
regolith-wm-config (4.11.9) jammy; urgency=medium
2+
3+
[ Khosrow Moossavi ]
4+
* feat: use build-only to test pull request
5+
6+
[ Ken Gilmer ]
7+
* fix: cause conflicts on control center packages so only one can be installed at a time
8+
9+
-- Ken Gilmer <[email protected]> Tue, 29 Apr 2025 19:16:40 -0700
10+
111
regolith-wm-config (4.11.8) jammy; urgency=medium
212

313
[ Khosrow Moossavi ]

debian/control

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ Depends: ${misc:Depends},
200200
regolith-control-center,
201201
gnome-settings-daemon
202202
Provides: regolith-wm-control-center
203-
Conflicts: regolith-wm-gnome
204-
Replaces: regolith-wm-gnome
203+
Conflicts: regolith-wm-gnome, regolith-i3-control-center-gnome
204+
Replaces: regolith-wm-gnome, regolith-i3-control-center-gnome
205205
Description: regolith and gnome integrations for system management
206206
Launch regolith settings app for system management.
207207

@@ -212,8 +212,8 @@ Depends: ${misc:Depends},
212212
regolith-control-center,
213213
gnome-settings-daemon
214214
Provides: regolith-wm-control-center
215-
Conflicts: regolith-wm-gnome
216-
Replaces: regolith-wm-gnome
215+
Conflicts: regolith-wm-gnome, regolith-sway-control-center-gnome
216+
Replaces: regolith-wm-gnome, regolith-sway-control-center-gnome
217217
Description: regolith and gnome integrations for system management
218218
Launch regolith settings app for system management.
219219

@@ -224,8 +224,8 @@ Depends: ${misc:Depends},
224224
gnome-control-center,
225225
gnome-settings-daemon
226226
Provides: regolith-wm-control-center
227-
Conflicts: regolith-wm-gnome
228-
Replaces: regolith-wm-gnome
227+
Conflicts: regolith-wm-gnome, regolith-sway-control-center-regolith
228+
Replaces: regolith-wm-gnome, regolith-sway-control-center-regolith
229229
Description: regolith and gnome integrations for system management
230230
Launch gnome settings app for system management.
231231

@@ -236,8 +236,8 @@ Depends: ${misc:Depends},
236236
gnome-control-center,
237237
gnome-settings-daemon
238238
Provides: regolith-wm-control-center
239-
Conflicts: regolith-wm-gnome
240-
Replaces: regolith-wm-gnome
239+
Conflicts: regolith-wm-gnome, regolith-i3-control-center-regolith
240+
Replaces: regolith-wm-gnome, regolith-i3-control-center-regolith
241241
Description: gnome integrations for system management
242242
Launch gnome settings app for system management.
243243

0 commit comments

Comments
 (0)