Merge lp:~gandelman-a/ubuntu/trusty/awesome/fix_desktop_file into lp:ubuntu/trusty/awesome

[Adam Gandelman]

Cherry picks a trivial patch that was applied upstream to fix the .desktop file, as reported in bugs against Ubuntu, Debian and Fedora. Released in Debian as of awesome 3.5.1 (experimental).

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

37. By Adam Gandelman on 2014-01-22

debian/patches/remove-nodisplay-from-desktop-file.patch: Removes
problematic "NoDisplay=true" from desktop file. Cherry picked from
upstream (LP: #1094811)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-11-23 15:33:07 +0000
+++ .pc/applied-patches	2014-01-22 08:44:28 +0000
@@ -1,1 +1,2 @@
 install-and-debian-menu
+remove-nodisplay-from-desktop-file.patch

=== added directory '.pc/remove-nodisplay-from-desktop-file.patch'
=== added file '.pc/remove-nodisplay-from-desktop-file.patch/awesome.desktop'
--- .pc/remove-nodisplay-from-desktop-file.patch/awesome.desktop	1970-01-01 00:00:00 +0000
+++ .pc/remove-nodisplay-from-desktop-file.patch/awesome.desktop	2014-01-22 08:44:28 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=awesome
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=awesome
+Exec=awesome
+Type=Application

=== modified file 'awesome.desktop'
--- awesome.desktop	2012-12-25 18:58:38 +0000
+++ awesome.desktop	2014-01-22 08:44:28 +0000
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Name=awesome
 Comment=Highly configurable framework window manager
-NoDisplay=true
 TryExec=awesome
 Exec=awesome
 Type=Application

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-17 10:44:54 +0000
+++ debian/changelog	2014-01-22 08:44:28 +0000
@@ -1,3 +1,11 @@
+awesome (3.4.15-1ubuntu1) trusty; urgency=low
+
+  * debian/patches/remove-nodisplay-from-desktop-file.patch: Removes
+    problematic "NoDisplay=true" from desktop file.  Cherry picked from
+    upstream (LP: #1094811)
+
+ -- Adam Gandelman <[e-mail]>  Wed, 22 Jan 2014 00:19:01 -0800
+
 awesome (3.4.15-1) unstable; urgency=low
 
   * New upstream release (Closes: #700607)

=== added file 'debian/patches/remove-nodisplay-from-desktop-file.patch'
--- debian/patches/remove-nodisplay-from-desktop-file.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-nodisplay-from-desktop-file.patch	2014-01-22 08:44:28 +0000
@@ -0,0 +1,25 @@
+From 5a2c4fa928554801dfbd807ec0d1f2a62ef25a4e Mon Sep 17 00:00:00 2001
+From: Adam Gandelman <[e-mail]>
+Date:  Wed Jan 22 00:22:14 PST 2014
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/awesome/+bug/1094811
+Forwarded: not-needed
+Source: http://git.naquadah.org/?p=awesome.git;a=commitdiff;h=5a2c4fa928554801dfbd807ec0d1f2a62ef25a4e
+Subject: [PATCH 1/1] Remove NoDisplay from desktop file
+
+Signed-off-by: Julien Danjou <[e-mail]>
+---
+ awesome.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+Index: awesome/awesome.desktop
+===================================================================
+--- awesome.orig/awesome.desktop	2014-01-22 00:25:38.526380699 -0800
++++ awesome/awesome.desktop	2014-01-22 00:25:38.518380683 -0800
+@@ -2,7 +2,6 @@
+ Encoding=UTF-8
+ Name=awesome
+ Comment=Highly configurable framework window manager
+-NoDisplay=true
+ TryExec=awesome
+ Exec=awesome
+ Type=Application

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-11-23 15:33:07 +0000
+++ debian/patches/series	2014-01-22 08:44:28 +0000
@@ -1,1 +1,2 @@
 install-and-debian-menu
+remove-nodisplay-from-desktop-file.patch