[meego-commits] 8450: Changes to Trunk:Netbook/gnome-bluetooth

[Ross Burton]

Hi,
I have made the following changes to gnome-bluetooth in project Trunk:Netbook. Please review and accept ASAP.

Thank You,
Ross Burton

[This message was auto-generated]

---

Request #8450:

  submit:   home:ross:branches:Trunk:Netbook/gnome-bluetooth(r2)(cleanup) -> Trunk:Netbook/gnome-bluetooth


Message:
    None

State:   new          2010-10-14T05:14:42 ross
Comment: None



changes files:
--------------
--- gnome-bluetooth.changes
+++ gnome-bluetooth.changes
@@ -0,0 +1,5 @@
+* Thu Oct 14 2010 Ross Burton <ross at linux.intel.com> 2.30.0_20101014
+- Show the correct device name when pairing fails (BMC#7541)
+- Fix the behaviour of the sidebar sizing (BMC#1179, BMC#7373)
+- Remove merged chunks from onlyshowin.patch
+

old:
----
  gnome-bluetooth-2.30.0_20100622.tar.bz2

new:
----
  gnome-bluetooth-2.30.0_20101014.tar.bz2

spec files:
-----------
--- gnome-bluetooth.spec
+++ gnome-bluetooth.spec
@@ -1,7 +1,7 @@
 Name: gnome-bluetooth
 Summary: Bluetooth graphical utilities
 Group: Applications/Communications
-Version: 2.30.0_20100622
+Version: 2.30.0_20101014
 License: GPLv2+/LGPLv2+
 URL: http://live.gnome.org/GnomeBluetooth
 Release: 1%{?dist}

other changes:
--------------

++++++ gnome-bluetooth-2.30.0_20100622.tar.bz2 -> gnome-bluetooth-2.30.0_20101014.tar.bz2
26562 lines of diff (skipped)

++++++ showin.patch
--- showin.patch
+++ showin.patch
@@ -1,22 +1,3 @@
-commit 6ada8f530f549013f268dabb2bb85abdb5276b44
-Author: Ross Burton <ross at linux.intel.com>
-Date:   Fri Jul 16 15:30:43 2010 +0100
-
-    meego: fix OnlyShowIn for meego 1.1
-
-diff --git a/moblin/bluetooth-panel.desktop.in.in b/moblin/bluetooth-panel.desktop.in.in
-index 1174e90..fb954ae 100644
---- a/moblin/bluetooth-panel.desktop.in.in
-+++ b/moblin/bluetooth-panel.desktop.in.in
-@@ -6,7 +6,7 @@ Icon=bluetooth
- Exec=@LIBEXECDIR@/bluetooth-panel
- Terminal=false
- Type=Application
--OnlyShowIn=MEEGO-NB;
-+OnlyShowIn=X-MEEGO-NB;
- X-GNOME-Autostart-enable=true
- X-Meego-Priority=Low
- X-Meego-Service=com.meego.UX.Shell.Panels.bluetooth
 diff -urN gnome-bluetooth-2.30.0_20100622/applet/bluetooth-applet.desktop.in.in gnome-bluetooth-2.30.0_20100622-new/applet/bluetooth-applet.desktop.in.in
 --- gnome-bluetooth-2.30.0_20100622/applet/bluetooth-applet.desktop.in.in	2010-06-22 04:06:45.000000000 -0700
 +++ gnome-bluetooth-2.30.0_20100622-new/applet/bluetooth-applet.desktop.in.in	2010-08-20 16:17:29.142914264 -0700