From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 8 Nov 2016 18:54:14 +0000 (+0100)
Subject: Merge branch 'next' into master
X-Git-Tag: 4.14.1~75
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1994eea5da1c83f35e5793ef6ca72a91d09eb824;p=i3%2Fi3

Merge branch 'next' into master
---

1994eea5da1c83f35e5793ef6ca72a91d09eb824
diff --cc debian/changelog
index bfbc8382,3c88a21e..80e2d5ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,17 +1,20 @@@
+ i3-wm (4.12.1-1) unstable; urgency=medium
+ 
 -  * UNRELEASED
++  * New upstream release.
++  * Move to debhelper 9
++  * Bump Standards-Version to 3.9.7 (no changes necessary)
++  * debian/watch: verify signature, use https
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Fri, 01 Apr 2016 16:34:35 +0200
+ 
+ i3-wm (4.12-2) unstable; urgency=medium
+ 
+   * Override lintian warning desktop-entry-contains-unknown-key for
+     DesktopNames, gdm needs that key.
+   * Remove i3-wm.menu to conform to the tech-ctte decision on #741573.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Fri, 01 Apr 2016 15:51:23 +0200
+ 
  i3-wm (4.12-1) unstable; urgency=medium
  
    * New upstream release.