Merge branch 'master' into next

Conflicts:
	debian/changelog

diff --git a/RELEASE-NOTES-4.1.2 b/RELEASE-NOTES-4.1.2
new file mode 100644 (file)
index 0000000..90bd9ed
--- /dev/null
+++ b/RELEASE-NOTES-4.1.2
@@ -0,0 +1,37 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.1.2  │
+ └──────────────────────────────┘
+
+This is the second minor release of i3 v4.1. It is a bugfix release and
+considered stable. All users of i3 v4.1.1 are strongly encouraged to upgrade.
+
+i3 developers will be present at FOSDEM in Brussels.
+Please get in touch and have a nice chat with us :).
+
+
+ ┌────────────────────────────┐
+ │ Changes in v4.1.2          │
+ └────────────────────────────┘
+
+  • Bugfix: Don’t lose focus on fullscreen windows when another window gets
+    moved to that workspace
+  • Bugfix: Open new windows in the correct place when assignments match
+  • Bugfix: Fix assignments of floating windows to (yet) unused workspaces
+  • Bugfix: Either use SetInputFocus *or* send WM_TAKE_FOCUS, not both
+  • Bugfix: Respect WM_HINTS.input for WM_TAKE_FOCUS clients
+  • Bugfix: Setup the _NET_SUPPORTING_WM_CHECK atom in a standards-compliant way
+  • Bugfix: Only ignore EnterNotify events after UnmapNotifies from managed windows
+  • Bugfix: Force a new sequence number after UnmapNotify
+  • Bugfix: Position floating windows exactly where their geometry specified
+  • Bugfix: Fix coordinates when the rect of an output changes
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  B-Con, David Coppa, Don, Paul, rami, zeus
+
+-- Michael Stapelberg, 2012-01-27

diff --git a/debian/changelog b/debian/changelog
index c9fe526841ce27486c88ae3824f6f4a2b3d5abf7..89608f77d17b9fb5c08a6282b01d9c55f2b2f139 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
-i3-wm (4.1.2-0) unstable; urgency=low
+i3-wm (4.1.3-0) unstable; urgency=low
 
   * NOT YET RELEASED
 
- -- Michael Stapelberg <michael@stapelberg.de>  Sat, 24 Dec 2011 16:29:16 +0100
+ -- Michael Stapelberg <michael@stapelberg.de>  Fri, 27 Jan 2012 19:34:11 +0000
+
+i3-wm (4.1.2-1) unstable; urgency=low
+
+  * Bugfix: Don’t lose focus on fullscreen windows when another window gets
+    moved to that workspace
+  * Bugfix: Open new windows in the correct place when assignments match
+  * Bugfix: Fix assignments of floating windows to (yet) unused workspaces
+  * Bugfix: Either use SetInputFocus *or* send WM_TAKE_FOCUS, not both
+  * Bugfix: Respect WM_HINTS.input for WM_TAKE_FOCUS clients
+  * Bugfix: Setup the _NET_SUPPORTING_WM_CHECK atom in a standards-compliant
+    way
+  * Bugfix: Only ignore EnterNotify events after UnmapNotifies from managed
+    windows
+  * Bugfix: Force a new sequence number after UnmapNotify
+  * Bugfix: Position floating windows exactly where their geometry specified
+  * Bugfix: Fix coordinates when the rect of an output changes
+
+ -- Michael Stapelberg <michael@stapelberg.de>  Fri, 27 Jan 2012 19:04:28 +0000
 
 i3-wm (4.1.1-1) unstable; urgency=low
 

diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index e984f40a364d32f4ce858744eeccd78884c33d3d..79cf2b41a403eed382b32c1c3fff3427bafca9f7 100644 (file)
--- a/man/asciidoc.conf
+++ b/man/asciidoc.conf
@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3</refmiscinfo>
-<refmiscinfo class="version">4.1.1</refmiscinfo>
+<refmiscinfo class="version">4.1.2</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>