From e88844b25bba8256ece9f9007bbb44919917f4af Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 26 May 2024 09:53:21 -0700 Subject: [PATCH 1/6] chore: update patches to use upstream bin name --- debian/patches/01-regolith-trawl.patch | 28 -------------------------- debian/patches/05-disable-config-files | 23 --------------------- debian/patches/05-remove-config | 23 +++++++++++++++++++++ debian/patches/series | 2 +- 4 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 debian/patches/05-disable-config-files create mode 100644 debian/patches/05-remove-config diff --git a/debian/patches/01-regolith-trawl.patch b/debian/patches/01-regolith-trawl.patch index b562231eae..88b58f71c3 100644 --- a/debian/patches/01-regolith-trawl.patch +++ b/debian/patches/01-regolith-trawl.patch @@ -49,25 +49,6 @@ Index: sway-regolith/meson.build wlroots_features = { 'xwayland': false, 'libinput_backend': false, -@@ -248,7 +269,7 @@ configure_file( - ) - - install_data( -- 'sway.desktop', -+ 'sway-regolith.desktop', - install_dir: join_paths(datadir, 'wayland-sessions') - ) - -Index: sway-regolith/sway-regolith.desktop -=================================================================== ---- /dev/null -+++ sway-regolith/sway-regolith.desktop -@@ -0,0 +1,5 @@ -+[Desktop Entry] -+Name=Sway Regolith -+Comment=A sway variant with support for trawl resource manager -+Exec=sway -+Type=Application Index: sway-regolith/sway/commands.c =================================================================== --- sway-regolith.orig/sway/commands.c @@ -189,12 +170,3 @@ Index: sway-regolith/sway/meson.build ] if have_xwayland -@@ -241,7 +243,7 @@ if wlroots_features['libinput_backend'] - endif - - executable( -- 'sway', -+ 'sway-regolith', - sway_sources + wl_protos_src, - include_directories: [sway_inc], - dependencies: sway_deps, diff --git a/debian/patches/05-disable-config-files b/debian/patches/05-disable-config-files deleted file mode 100644 index bf9579f142..0000000000 --- a/debian/patches/05-disable-config-files +++ /dev/null @@ -1,23 +0,0 @@ -Index: sway-regolith/meson.build -=================================================================== ---- sway-regolith.orig/meson.build -+++ sway-regolith/meson.build -@@ -249,18 +249,6 @@ config.set('datadir', join_paths(prefix, - config.set('prefix', prefix) - config.set('sysconfdir', join_paths(prefix, sysconfdir)) - --configure_file( -- configuration: config, -- input: 'config.in', -- output: '@BASENAME@', -- install_dir: join_paths(sysconfdir, 'sway') --) -- --install_data( -- 'sway-regolith.desktop', -- install_dir: join_paths(datadir, 'wayland-sessions') --) -- - if get_option('default-wallpaper') - wallpaper_files = files( - 'assets/Sway_Wallpaper_Blue_768x1024.png', diff --git a/debian/patches/05-remove-config b/debian/patches/05-remove-config new file mode 100644 index 0000000000..4383d575b0 --- /dev/null +++ b/debian/patches/05-remove-config @@ -0,0 +1,23 @@ +Index: sway-regolith/meson.build +=================================================================== +--- sway-regolith.orig/meson.build ++++ sway-regolith/meson.build +@@ -244,18 +244,6 @@ if get_option('swaynag') + subdir('swaynag') + endif + +-config = configuration_data() +-config.set('datadir', join_paths(prefix, datadir)) +-config.set('prefix', prefix) +-config.set('sysconfdir', join_paths(prefix, sysconfdir)) +- +-configure_file( +- configuration: config, +- input: 'config.in', +- output: '@BASENAME@', +- install_dir: join_paths(sysconfdir, 'sway') +-) +- + install_data( + 'sway.desktop', + install_dir: join_paths(datadir, 'wayland-sessions') diff --git a/debian/patches/series b/debian/patches/series index f5d62a0d2c..1a491af753 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,4 @@ 02-version-fix.patch 03-disable-wallpaper 04-dbus-tray -05-disable-config-files +05-remove-config From 88b5271ad61ad3f68d98ac30952d853067bb3b8a Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 26 May 2024 10:02:05 -0700 Subject: [PATCH 2/6] fix: clean up package metadata --- debian/control | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index bd6e9ac705..08a7290056 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: Soumya Ranjan Patnaik , Regolith Desktop Build-Depends: debhelper-compat (= 13), libcairo2-dev, libcap-dev, @@ -29,14 +27,16 @@ 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, + libtrawldb, + polkitd, + swaybg, + ${misc:Depends}, + ${shlibs:Depends} Suggests: xdg-desktop-portal-wlr Provides: sway Description: i3-compatible Wayland compositor for the Regolith desktop environment From 36cd00c23f3f2b8b50c98243dd39937eb6f1cec2 Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 26 May 2024 10:03:25 -0700 Subject: [PATCH 3/6] chore: Package changes --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa1c96edf6..e2459f3ad4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sway-regolith (1.9-15) noble; urgency=medium + + * chore: update patches to use upstream bin name + * fix: clean up package metadata + + -- Regolith Linux Sun, 26 May 2024 10:02:24 -0700 + sway-regolith (1.9-5) noble; urgency=medium [ Soumya Ranjan Patnaik ] From b1857f959dce148f03243829f3736b5acf349ccc Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Sun, 26 May 2024 10:05:22 -0700 Subject: [PATCH 4/6] fix: declare incompat w/ upstream --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 08a7290056..179142bbd9 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,8 @@ Depends: libgl1-mesa-dri, ${shlibs:Depends} Suggests: xdg-desktop-portal-wlr Provides: sway +Conflicts: sway +Replaces: 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 From 5ef388bf7d66c2006de74ae357bb9b547b3189d7 Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Mon, 27 May 2024 09:48:34 -0700 Subject: [PATCH 5/6] fix: remove desktop session file --- debian/patches/05-remove-config | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/patches/05-remove-config b/debian/patches/05-remove-config index 4383d575b0..80f1d89180 100644 --- a/debian/patches/05-remove-config +++ b/debian/patches/05-remove-config @@ -2,7 +2,7 @@ Index: sway-regolith/meson.build =================================================================== --- sway-regolith.orig/meson.build +++ sway-regolith/meson.build -@@ -244,18 +244,6 @@ if get_option('swaynag') +@@ -244,23 +244,6 @@ if get_option('swaynag') subdir('swaynag') endif @@ -18,6 +18,11 @@ Index: sway-regolith/meson.build - install_dir: join_paths(sysconfdir, 'sway') -) - - install_data( - 'sway.desktop', - install_dir: join_paths(datadir, 'wayland-sessions') +-install_data( +- 'sway.desktop', +- install_dir: join_paths(datadir, 'wayland-sessions') +-) +- + if get_option('default-wallpaper') + wallpaper_files = files( + 'assets/Sway_Wallpaper_Blue_768x1024.png', From 45a82ec52b866e7bbf61dd8a2eb44d74bac60bd5 Mon Sep 17 00:00:00 2001 From: Regolith Linux Date: Mon, 27 May 2024 09:50:24 -0700 Subject: [PATCH 6/6] chore: Package changes --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e2459f3ad4..5fc80f3982 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sway-regolith (1.9-16) noble; urgency=medium + + * fix: remove desktop session file + + -- Regolith Linux Mon, 27 May 2024 09:48:43 -0700 + sway-regolith (1.9-15) noble; urgency=medium * chore: update patches to use upstream bin name