--- i3-gaps-wm-4.19.orig/README.md +++ i3-gaps-wm-4.19/README.md @@ -1,114 +1,8 @@ -[![Travis](https://img.shields.io/travis/Airblader/i3.svg)](https://travis-ci.org/Airblader/i3) -[![Issues](https://img.shields.io/github/issues/Airblader/i3.svg)](https://github.com/Airblader/i3/issues) -[![Forks](https://img.shields.io/github/forks/Airblader/i3.svg)](https://github.com/Airblader/i3/network) -[![Stars](https://img.shields.io/github/stars/Airblader/i3.svg)](https://github.com/Airblader/i3/stargazers) +## i3-gaps -# i3-gaps +This repository is a snapshot of [i3-gaps](https://github.com/Airblader/i3) 4.19 release with the following changes: -## What is i3-gaps? +* Provide a unique Debian package identity (`i3-gaps-wm`) over the upstream project, [i3-wm](https://github.com/i3/i3). +* Breaking the Xsession files into a distinct package, so that they can be selectively installed. -i3-gaps is a fork of [i3wm](https://www.i3wm.org), a tiling window manager for X11. It is kept up to date with upstream, adding a few additional features such as gaps between windows (see below for a complete list). - -![i3](http://i.imgur.com/y8sZE6o.jpg) - -## How do I install i3-gaps? - -Please refer to the [wiki](https://github.com/Airblader/i3/wiki/installation). - -## Where can I get help? - -For bug reports or feature requests regarding i3-gaps specifically, open an issue on [GitHub](https://www.github.com/Airblader/i3). If your issue is with core i3 functionality, please report it [upstream](https://www.github.com/i3/i3). - -For support & all other kinds of questions, you can ask your question on the official [subreddit /r/i3wm](https://www.reddit.com/r/i3wm). - -# Features - -## i3 - -### gaps - -*Note:* In order to use gaps you need to disable window titlebars. This can be done by adding the following line to your config. - -``` -# You can also use any non-zero value if you'd like to have a border -for_window [class=".*"] border pixel 0 -``` - -Gaps are the namesake feature of i3-gaps and add spacing between windows/containers. Gaps come in two flavors, inner and outer gaps wherein inner gaps are those between two adjacent containers (or a container and an edge) and outer gaps are an additional spacing along the screen edges. Gaps can be configured in your config either globally or per workspace, and can additionally be changed during runtime using commands (e.g., through `i3-msg`). - -*Note:* Outer gaps are added to the inner gaps, i.e., the gaps between a screen edge and a container will be the sum of outer and inner gaps. - -#### Configuration - -You can define gaps either globally or per workspace using the following syntax. Note that the gaps configurations should be ordered from least specific to most specific as some directives can overwrite others. - -``` -gaps [inner|outer|horizontal|vertical|top|left|bottom|right] -workspace gaps [inner|outer|horizontal|vertical|top|left|bottom|right] -``` - -The `inner` and `outer` keywords are as explained above. With `top`, `left`, `bottom` and `right` you can specify outer gaps on specific sides, and `horizontal` and `vertical` are shortcuts for the respective sides. `` stands for a numeric value in pixels and `` for either a workspace number or a workspace name. - -#### Commands - -Gaps can be modified at runtime with the following command syntax: - -``` -gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all set|plus|minus|toggle - -# Examples -gaps inner all set 20 -gaps outer current plus 5 -gaps horizontal current plus 40 -gaps outer current toggle 60 -``` - -With `current` or `all` you can change gaps either for only the currently focused or all currently existing workspaces (note that this does not affect the global configuration itself). - -You can find an example configuration in the [wiki](https://github.com/Airblader/i3/wiki/Example-Configuration). - -### Smart Gaps - -Gaps can be automatically turned on/off on a workspace in certain scenarios using the following config directives: - -``` -# Only enable gaps on a workspace when there is at least one container -smart_gaps on - -# Only enable outer gaps when there is exactly one container -smart_gaps inverse_outer -``` - -### Smart Borders - -Smart borders will draw borders on windows only if there is more than one window in a workspace. This feature can also be enabled only if the gap size between window and screen edge is `0`. - -``` -# Activate smart borders (always) -smart_borders on - -# Activate smart borders (only when there are effectively no gaps) -smart_borders no_gaps -``` - -### Smart Edge Borders - -This extends i3's `hide_edge_borders` with a new option. When set, edge-specific borders of a container will be hidden if it's the only container on the workspace and the gaps to the screen edge is `0`. - -``` -# Hide edge borders only if there is one window with no gaps -hide_edge_borders smart_no_gaps -``` - -## i3bar - -### Bar Height - -The height of an i3bar instance can be specified explicitly by defining the `height` key in the bar configuration. If not set, the height will be calculated automatically depending on the font size. - -``` -bar { - # Height in pixels - height 25 -} -``` +Please see the [i3-gaps](https://github.com/Airblader/i3) and [i3-wm](https://github.com/i3/i3) projects for all other details. \ No newline at end of file --- i3-gaps-wm-4.19.orig/debian/changelog +++ i3-gaps-wm-4.19/debian/changelog @@ -1,14 +1,16 @@ -i3-wm (4.19.1-1) unstable; urgency=medium +i3-gaps-wm (4.19-1ubuntu1) bionic; urgency=medium - * New upstream release. + [ Ken Gilmer ] + * Update debian packaging for naming of package from i3 to i3-gaps. Add binary package for Xsession. - -- Michael Stapelberg Mon, 19 Oct 2020 22:48:30 +0200 + -- Regolith Linux Thu, 26 Nov 2020 14:17:27 -0800 i3-wm (4.19-1) unstable; urgency=medium + [ Michael Stapelberg ] * New upstream release. - -- Michael Stapelberg Sun, 15 Nov 2020 18:28:11 +0100 + -- Regolith Linux Thu, 26 Nov 2020 13:59:53 -0800 i3-wm (4.18.3-1) unstable; urgency=medium --- i3-gaps-wm-4.19.orig/debian/control +++ i3-gaps-wm-4.19/debian/control @@ -1,4 +1,4 @@ -Source: i3-wm +Source: i3-gaps-wm Section: x11 Priority: extra Maintainer: Michael Stapelberg @@ -26,37 +26,45 @@ libstartup-notification0-dev (>= 0.10), libcairo2-dev (>= 1.14.4), libpango1.0-dev, - libpod-simple-perl -Standards-Version: 3.9.8 + libpod-simple-perl, + quilt +Standards-Version: 4.4.0 Homepage: https://i3wm.org/ -Package: i3 +Package: i3-gaps Architecture: any -Depends: i3-wm (=${binary:Version}), ${misc:Depends} +Depends: i3-gaps-wm (=${binary:Version}), i3-gaps-session (=${binary:Version}), ${misc:Depends} Recommends: i3lock (>= 2.2), suckless-tools, i3status (>= 2.3), dunst -Description: metapackage (i3 window manager, screen locker, menu, statusbar) - This metapackage installs the i3 window manager (i3-wm), the i3lock screen +Description: metapackage (i3-gaps window manager, screen locker, menu, statusbar) + This metapackage installs the i3-gaps window manager (i3-gaps-wm), xsession, the i3lock screen locker, i3status (for system information) and suckless-tools (for dmenu). - These are all the tools you need to use the i3 window manager efficiently. + These are all the tools you need to use the i3-gaps window manager efficiently. -Package: i3-wm +Package: i3-gaps-wm Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} -Provides: x-window-manager +Provides: x-window-manager, i3-wm +Replaces: i3-wm +Conflicts: i3-wm Recommends: xfonts-base, fonts-dejavu-core, libanyevent-i3-perl (>= 0.12), libjson-xs-perl, rxvt-unicode | x-terminal-emulator Description: improved dynamic tiling window manager - Key features of i3 are good documentation, reasonable defaults (changeable in + Key features of i3-gaps are good documentation, reasonable defaults (changeable in a simple configuration file) and good multi-monitor support. The user - interface is designed for power users and emphasizes keyboard usage. i3 uses + interface is designed for power users and emphasizes keyboard usage. i3-gaps uses XCB for asynchronous communication with X11 and aims to be fast and light-weight. . - Please be aware i3 is primarily targeted at advanced users and developers. + Please be aware i3-gaps is primarily targeted at advanced users and developers. -Package: i3-wm-dbg +Package: i3-gaps-wm-dbg Architecture: any Section: debug -Depends: i3-wm (=${binary:Version}), ${misc:Depends} -Description: Debugging symbols for the i3 window manager - Debugging symbols for the i3 window manager. Please install this to produce +Depends: i3-gaps-wm (=${binary:Version}), ${misc:Depends} +Description: Debugging symbols for the i3-gaps window manager + Debugging symbols for the i3-gaps window manager. Please install this to produce useful backtraces before creating new tickets. + +Package: i3-gaps-session +Architecture: any +Depends: i3-gaps-wm (=${binary:Version}), ${misc:Depends} +Description: Xsession for i3-gaps --- i3-gaps-wm-4.19.orig/debian/i3-gaps-session.install +++ i3-gaps-wm-4.19/debian/i3-gaps-session.install @@ -0,0 +1,2 @@ +share/xsessions/i3-with-shmlog.desktop /usr/share/xsessions/ +share/xsessions/i3.desktop /usr/share/xsessions/ \ No newline at end of file --- i3-gaps-wm-4.19.orig/debian/i3-gaps-wm.install +++ i3-gaps-wm-4.19/debian/i3-gaps-wm.install @@ -0,0 +1,8 @@ +debian/tmp/etc +debian/tmp/usr/bin +debian/tmp/usr/include +contrib/dump-asy.pl usr/share/doc/i3-wm/examples/ +contrib/gtk-tree-watch.pl usr/share/doc/i3-wm/examples/ +contrib/i3-wsbar usr/share/doc/i3-wm/examples/ +contrib/per-workspace-layout.pl usr/share/doc/i3-wm/examples/ +contrib/trivial-bar-script.sh usr/share/doc/i3-wm/examples/ --- i3-gaps-wm-4.19.orig/debian/rules +++ i3-gaps-wm-4.19/debian/rules @@ -4,18 +4,21 @@ export V:=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +#override_dh_installman: + # Disable this task + override_dh_installchangelogs: dh_installchangelogs RELEASE-NOTES-* override_dh_strip: - dh_strip --dbg-package=i3-wm-dbg + dh_strip --dbg-package=i3-gaps-wm-dbg override_dh_auto_test: # TODO: enable tests override_dh_auto_configure: # Set -Ddocdir; the default is /usr/share/doc/i3 - dh_auto_configure -- -Ddocdir=/usr/share/doc/i3-wm -Dmans=true + dh_auto_configure -- -Ddocdir=/usr/share/doc/i3-gaps-wm -Dmans=true override_dh_builddeb: # bintray does not support xz currently.