debian: remove menu file, add lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index f351574a1684f3aeed7a0682ff25851b1ad5cb53..3c88a21e98b94c51c718637225ed5e990bc4086a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,15 @@ i3-wm (4.12.1-1) unstable; urgency=medium
 
   * UNRELEASED
 
- -- Michael Stapelberg <stapelberg@debian.org>  Wed, 30 Sep 2015 09:03:26 +0200
+ -- 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
 

diff --git a/debian/i3-wm.lintian-overrides b/debian/i3-wm.lintian-overrides
new file mode 100644 (file)
index 0000000..a999fe4
--- /dev/null
+++ b/debian/i3-wm.lintian-overrides
@@ -0,0 +1,2 @@
+# gdm needs the DesktopNames key, even though lintian doesn’t recognize it yet.
+desktop-entry-contains-unknown-key usr/share/xsessions/i3.desktop:* DesktopNames

diff --git a/debian/i3-wm.menu b/debian/i3-wm.menu
deleted file mode 100644 (file)
index 6c0704f..0000000
--- a/debian/i3-wm.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(i3-wm): \
-       needs="wm" \
-       section="Window Managers" \
-       title="i3" \
-       command="/usr/bin/i3"