diff --git a/debian/changelog b/debian/changelog index aa1c96edf6..5fc80f3982 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +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 + * 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 ] diff --git a/debian/control b/debian/control index bd6e9ac705..179142bbd9 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,16 +27,20 @@ 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 +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 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-remove-config similarity index 65% rename from debian/patches/05-disable-config-files rename to debian/patches/05-remove-config index bf9579f142..80f1d89180 100644 --- a/debian/patches/05-disable-config-files +++ b/debian/patches/05-remove-config @@ -2,10 +2,15 @@ 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)) +@@ -244,23 +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', @@ -14,7 +19,7 @@ Index: sway-regolith/meson.build -) - -install_data( -- 'sway-regolith.desktop', +- '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