forked from swaywm/sway
-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: isolate files shared with upstream in supplemental package #25
Open
kgilmer
wants to merge
10
commits into
packaging/v1.9-regolith
Choose a base branch
from
fix-isolate-collisions
base: packaging/v1.9-regolith
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e8c3b50
fix: isolate files shared with upstream in supplemental package
c328788
chore: Package changes
f76f476
experiement: see if ordering and priority impact package solver
886b7de
experiement: see if ordering and priority impact package solver II
f4dee47
experiement: see if ordering and priority impact package solver III
2551fec
experiment: add meta packags to control package selection. Try adding…
33274bc
experiement: downgrade association to internal package from Recommend…
2214b4a
experiement: clean up priority. tweaks to package metadata
797a27c
experiement: more tweaks, remove meta packages
77dbff6
experiement: remove non-working metadata from package
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| sway-regolith (1.9-14) noble; urgency=medium | ||
|
|
||
| * fix: isolate files shared with upstream in supplemental package | ||
|
|
||
| -- Regolith Linux <[email protected]> Sat, 18 May 2024 08:47:20 -0700 | ||
|
|
||
| sway-regolith (1.9-5) noble; urgency=medium | ||
|
|
||
| [ Soumya Ranjan Patnaik ] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| Source: sway-regolith | ||
| Section: x11 | ||
| Priority: optional | ||
| Maintainer: Sway and related packages team <[email protected]> | ||
| Uploaders: Birger Schacht <[email protected]>, | ||
| nicoo <[email protected]> | ||
| Maintainer: Regolith Desktop <[email protected]> | ||
| 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. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| usr/bin/swaybar | ||
| usr/bin/swaymsg | ||
| usr/bin/swaynag | ||
| usr/share/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| usr/bin/sway-regolith |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my opinion this is still required. Many packages have a hard dependency on sway. Without this, the sway session will possibly lose out on much of the sway ecosystem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just realised that the supplemental package replaces sway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, the user MUST have EITHER
swayORsway-regolith-supplementalinstalled. Or this is my intention. LMK if this seems off.