diff -Nru awesome-3.4.15/debian/changelog awesome-3.4.15/debian/changelog --- awesome-3.4.15/debian/changelog 2013-02-17 09:45:23.000000000 +0000 +++ awesome-3.4.15/debian/changelog 2014-01-23 14:18:36.000000000 +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 Wed, 22 Jan 2014 00:19:01 -0800 + awesome (3.4.15-1) unstable; urgency=low * New upstream release (Closes: #700607) diff -Nru awesome-3.4.15/debian/control awesome-3.4.15/debian/control --- awesome-3.4.15/debian/control 2013-02-17 09:44:30.000000000 +0000 +++ awesome-3.4.15/debian/control 2014-01-23 14:19:28.000000000 +0000 @@ -1,7 +1,8 @@ Source: awesome Section: x11 Priority: optional -Maintainer: Julien Danjou +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Julien Danjou Build-Depends: debhelper (>= 9), libcairo2-dev, xmlto, asciidoc, libpango1.0-dev, cmake (>= 2.6.0), gperf, lua5.1, luadoc (>= 3.0.1), libxcb-xtest0-dev, libxcb-icccm4-dev (>= 0.3.8), libxcb-randr0-dev (>= 0.3.0), libxcb-keysyms1-dev (>= 0.3.4), libxcb-xinerama0-dev, libxcb-image0-dev (>= 0.3.0), libev-dev, liblua5.1-dev, libimlib2-dev, libdbus-1-dev, libxdg-basedir-dev (>= 1.0.0), libstartup-notification0-dev (>= 0.10), imagemagick, libxcb1-dev (>= 1.6), libxcb-shape0-dev, libxcb-util0-dev, libxcursor-dev, libx11-xcb-dev Standards-Version: 3.9.3 Homepage: http://awesome.naquadah.org diff -Nru awesome-3.4.15/debian/patches/remove-nodisplay-from-desktop-file.patch awesome-3.4.15/debian/patches/remove-nodisplay-from-desktop-file.patch --- awesome-3.4.15/debian/patches/remove-nodisplay-from-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ awesome-3.4.15/debian/patches/remove-nodisplay-from-desktop-file.patch 2014-01-23 14:18:36.000000000 +0000 @@ -0,0 +1,25 @@ +From 5a2c4fa928554801dfbd807ec0d1f2a62ef25a4e Mon Sep 17 00:00:00 2001 +From: Adam Gandelman +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 +--- + 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 diff -Nru awesome-3.4.15/debian/patches/series awesome-3.4.15/debian/patches/series --- awesome-3.4.15/debian/patches/series 2013-02-17 09:44:30.000000000 +0000 +++ awesome-3.4.15/debian/patches/series 2014-01-23 14:18:36.000000000 +0000 @@ -1 +1,2 @@ install-and-debian-menu +remove-nodisplay-from-desktop-file.patch