Merge lp:~unit193/ubiquity/xfwm4-panel into lp:ubiquity

[Unit 193]

Got an ack from Mythbuntu and UbuntuStudio for this change.

[Simon Steinbeiß (ochosi)]

As I've previously tested the panel and both Myth and Studio agree, it's approved with my Xubuntu Project Lead hat on.

review: Approve

[Sean Davis (bluesabre)]

Approve as Xubuntu Technical Lead.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2014-07-21 20:40:11 +0000
+++ bin/ubiquity-dm	2014-12-11 14:31:21 +0000
@@ -497,8 +497,7 @@
                     stdin=null, stdout=logfile, stderr=logfile,
                     preexec_fn=self.drop_privileges))
 
-            if (os.path.exists('/usr/lib/ubiquity/panel') and
-                    "xfwm4" not in wm_cmd):
+            if os.path.exists('/usr/lib/ubiquity/panel'):
                 if ("openbox-lubuntu" not in wm_cmd and
                         "openbox" not in wm_cmd and
                         "gnome-shell" not in wm_cmd):
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-11-12 14:34:56 +0000
+++ debian/changelog	2014-12-11 14:31:21 +0000
@@ -1,3 +1,9 @@
+ubiquity (2.21.1) UNRELEASED; urgency=medium
+
+  * Enable the ubiquity panel in xfwm4 now since it is functional.
+
+ -- Unit 193 <[e-mail]>  Thu, 11 Dec 2014 09:12:36 -0500
+
 ubiquity (2.21.0) vivid; urgency=medium
 
   [ Colin Watson ]