From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 24 Dec 2011 15:28:48 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=20b8b1a22a9946e7736a5a3760ba8fdf648293d5;hp=cea6f7ad96c5e28274dd49c4c394db7f80884bde;p=i3%2Fi3

Merge branch 'master' into next
---

diff --git a/RELEASE-NOTES-4.1.1 b/RELEASE-NOTES-4.1.1
new file mode 100644
index 00000000..09e40da1
--- /dev/null
+++ b/RELEASE-NOTES-4.1.1
@@ -0,0 +1,54 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.1.1  │
+ └──────────────────────────────┘
+
+This is the first minor release of i3 v4.1. It is a bugfix release and
+considered stable. All users of i3 v4.1 are strongly encouraged to upgrade.
+
+Happy holidays and enjoy i3 :).
+
+i3 developers will be present at 28C3 in Berlin and FOSDEM 2012 in Brussels.
+Please get in touch and have a nice chat with us :).
+
+
+ ┌────────────────────────────┐
+ │ Changes in v4.1.1          │
+ └────────────────────────────┘
+
+  • Create a secure temp path instead of a predictable one
+  • ipc: set CLOEXEC on client file descriptors
+  • Fix prototype in include/xcursor.h
+  • Bugfix: Skip dock clients when handling FocusIn events
+  • Bugfix: Fix fullscreen with floating windows
+  • Bugfix: Fix startup when RandR is not present
+  • Bugfix: Retain window position and size when changing floating border
+  • Bugfix: Disallow focusing dock clients via criteria
+  • Bugfix: Don’t create a workspace named 'back_and_forth' on startup
+  • Bugfix: Fix wrong focus in complex tabbed/stacked layouts
+  • Bugfix: Fix resizing for (e.g.) v-split containers in h-split containers
+  • Bugfix: Fix 'resize' command in nested containers
+  • Bugfix: Don’t set the _NET_WM_WORKAREA hint at all
+  • Bugfix: Skip leading whitespace in variable assignments
+  • Bugfix: Make resizing of tiling windows with floating_modifier use absolute
+    coordinates
+  • Bugfix: Make resizing work when pressing floating_modifier + right mouse
+    button on window decorations
+  • Bugfix: Fix setting the same mark repeatedly on different windows
+  • Bugfix: Disallow focusing other windows when in fullscreen mode
+  • Bugfix: Ignore ConfigureRequests with out-of-bound coordinates
+  • Bugfix: Correctly check boundaries and reassign floating windows when
+    moving
+  • Bugfix: Don’t close workspace when there are still floating windows on it
+
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  aksr, ben, biiter, binzter, cg, cradle, f8l, gregkh, Han, Miguel, mseed,
+  noxxun, Phlogistique
+
+-- Michael Stapelberg, 2011-12-24
diff --git a/debian/changelog b/debian/changelog
index e9f9d43d..70897a74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-i3-wm (4.1.1-0) unstable; urgency=low
+i3-wm (4.1.1-1) unstable; urgency=low
 
-  * NOT YET RELEASED
+  * Re-add build-arch/build-indep targets to debian/rules (Closes: #648613)
+  * Create a secure temp path instead of a predictable one
   * ipc: set CLOEXEC on client file descriptors
   * Fix prototype in include/xcursor.h
   * Bugfix: Skip dock clients when handling FocusIn events
@@ -19,8 +20,13 @@ i3-wm (4.1.1-0) unstable; urgency=low
   * Bugfix: Make resizing work when pressing floating_modifier + right mouse
     button on window decorations
   * Bugfix: Fix setting the same mark repeatedly on different windows
+  * Bugfix: Disallow focusing other windows when in fullscreen mode
+  * Bugfix: Ignore ConfigureRequests with out-of-bound coordinates
+  * Bugfix: Correctly check boundaries and reassign floating windows when
+    moving
+  * Bugfix: Don’t close workspace when there are still floating windows on it
 
- -- Michael Stapelberg <michael@stapelberg.de>  Sat, 17 Dec 2011 14:29:59 +0000
+ -- Michael Stapelberg <michael@stapelberg.de>  Sat, 24 Dec 2011 16:23:55 +0100
 
 i3-wm (4.1-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index a488469d..a6bfc2c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,9 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
 	dh build
 	touch build-stamp
diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index ead3567f..e984f40a 100644
--- 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</refmiscinfo>
+<refmiscinfo class="version">4.1.1</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>