Merge branch 'master' into next

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
 

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