Merge lp:~muktupavels/gnome-panel/lp-1332183 into lp:ubuntu/utopic/gnome-panel

[Alberts Muktupāvels]

Don't show compiz session if it is not installed.

Don't show compiz session if it is not installed.

[Dmitry Shachnev (mitya57)]

Looks like you forgot to run `quilt refresh`, so the patch was *not* modified. Fixed that and uploaded, thanks!

review: Approve

[Alberts Muktupāvels (muktupavels)]

Hmm. I did run quilt refresh. Also diff shows that patch is updated. Or did I forgot something else?

[Dmitry Shachnev (mitya57)]

Nevermind, it probably was my mistake.

=== modified file 'data/gnome-fallback-compiz.desktop.in'
--- data/gnome-fallback-compiz.desktop.in	2014-03-01 14:39:38 +0000
+++ data/gnome-fallback-compiz.desktop.in	2014-06-20 06:25:37 +0000
@@ -2,7 +2,7 @@
 _Name=GNOME Flashback (Compiz)
 _Comment=This session logs you into GNOME with the traditional panel
 Exec=gnome-session --session=gnome-flashback-compiz
-TryExec=gnome-session
+TryExec=compiz
 Icon=
 Type=Application
 X-LightDM-DesktopName=Unity

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-07 14:18:13 +0000
+++ debian/changelog	2014-06-20 06:25:37 +0000
@@ -1,3 +1,10 @@
+gnome-panel (1:3.8.0-1ubuntu14) UNRELEASED; urgency=medium
+
+  * Update 50_ubuntu_sessions.patch to fix bug when Compiz
+    session is available even if it is not installed (lp: #1332183).
+
+ -- Alberts Muktupāvels <[e-mail]>  Fri, 20 Jun 2014 09:19:57 +0300
+
 gnome-panel (1:3.8.0-1ubuntu13) utopic; urgency=medium
 
   * Again update 40_unset_menuproxy.patch to restore menu proxy

=== modified file 'debian/patches/50_ubuntu_sessions.patch'
--- debian/patches/50_ubuntu_sessions.patch	2014-03-01 14:39:38 +0000
+++ debian/patches/50_ubuntu_sessions.patch	2014-06-20 06:25:37 +0000
@@ -11,7 +11,7 @@
 +_Name=GNOME Flashback (Compiz)
 +_Comment=This session logs you into GNOME with the traditional panel
 +Exec=gnome-session --session=gnome-flashback-compiz
-+TryExec=gnome-session
++TryExec=compiz
 +Icon=
 +Type=Application
 +X-LightDM-DesktopName=Unity