Merge lp:~bmillemathias/ubuntu/lucid/gnome-bluetooth/lp_529734 into lp:ubuntu/lucid/gnome-bluetooth

[Baptiste Mille-Mathias]

This is a small patch to include for request in bug 529734

[James Westby (james-w)]

Added the changelog entry and uploaded.

Thanks,

James

review: Approve

=== added file 'debian/patches/03_add-lxde-properties.patch'
--- debian/patches/03_add-lxde-properties.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_add-lxde-properties.patch	2010-04-07 20:20:51 +0000
@@ -0,0 +1,14 @@
+# Show bluetooth-properties in a LXDE session
+# Patch from Julien Lavergne (LP: #529734)
+diff -Nur -x '*.orig' -x '*~' gnome-bluetooth/properties/bluetooth-properties.desktop.in.in gnome-bluetooth.new/properties/bluetooth-properties.desktop.in.in
+--- gnome-bluetooth/properties/bluetooth-properties.desktop.in.in	2010-04-07 22:00:42.679624000 +0200
++++ gnome-bluetooth.new/properties/bluetooth-properties.desktop.in.in	2010-04-07 22:01:53.646701116 +0200
+@@ -6,7 +6,7 @@
+ Terminal=false
+ Type=Application
+ Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;
+-OnlyShowIn=GNOME;XFCE;
++OnlyShowIn=GNOME;XFCE;LXDE;
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-bluetooth