[Pkg-bluetooth-commits] r815 - in /packages/bluez-gnome/trunk/debian: changelog control patches/020_remove_empty_statusicon.patch

[filippo at users.alioth.debian.org]

Author: filippo
Date: Sun May 24 20:27:36 2009
New Revision: 815

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=815
Log:
Fix "defective icon placement in window manager dock" with
debian/patches/020_remove_empty_statusicon.patch by removing an empty
GtkStatusIcon (Closes: #529026)

Added:
    packages/bluez-gnome/trunk/debian/patches/020_remove_empty_statusicon.patch
Modified:
    packages/bluez-gnome/trunk/debian/changelog
    packages/bluez-gnome/trunk/debian/control

Modified: packages/bluez-gnome/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-gnome/trunk/debian/changelog?rev=815&op=diff
==============================================================================
--- packages/bluez-gnome/trunk/debian/changelog (original)
+++ packages/bluez-gnome/trunk/debian/changelog Sun May 24 20:27:36 2009
@@ -1,4 +1,4 @@
-bluez-gnome (1.8-0exp1) experimental; urgency=low
+bluez-gnome (1.8-1) unstable; urgency=low
 
   * New upstream release
     - Not compatible with bluez 3.x series, depend on bluez 4.x accordingly
@@ -7,8 +7,11 @@
   * Upgrade to S-V 3.8.1: no changes needed
   * Remove preinst code for handling pre-0.5 conffile
   * Update debian/copyright with new copyright and statements
+  * Fix "defective icon placement in window manager dock" with
+    debian/patches/020_remove_empty_statusicon.patch by removing an empty
+    GtkStatusIcon (Closes: #529026)
 
- -- Filippo Giunchedi <filippo at debian.org>  Wed, 13 May 2009 11:49:46 +0200
+ -- Filippo Giunchedi <filippo at debian.org>  Sun, 24 May 2009 11:32:08 +0200
 
 bluez-gnome (0.27-1) unstable; urgency=low
 

Modified: packages/bluez-gnome/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-gnome/trunk/debian/control?rev=815&op=diff
==============================================================================
--- packages/bluez-gnome/trunk/debian/control (original)
+++ packages/bluez-gnome/trunk/debian/control Sun May 24 20:27:36 2009
@@ -13,8 +13,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, gnome-icon-theme (>= 2.16), bluez (>= 4), obex-data-server (>= 0.4)
 Recommends: gnome-vfs-obexftp
-Conflicts: bluez-passkey-gnome (<= 0.5-2)
-Replaces: bluez-passkey-gnome
+Conflicts: gnome-bluetooth (>= 2.0)
+Replaces: gnome-bluetooth (>= 2.0)
 Description: Bluetooth utilities for GNOME
  This package contains various GNOME applets to detect bluetooth adapters and
  configure them.

Added: packages/bluez-gnome/trunk/debian/patches/020_remove_empty_statusicon.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-gnome/trunk/debian/patches/020_remove_empty_statusicon.patch?rev=815&op=file
==============================================================================
--- packages/bluez-gnome/trunk/debian/patches/020_remove_empty_statusicon.patch (added)
+++ packages/bluez-gnome/trunk/debian/patches/020_remove_empty_statusicon.patch Sun May 24 20:27:36 2009
@@ -1,0 +1,12 @@
+--- applet/notify.c
++++ applet/notify.c
+@@ -92,9 +92,6 @@ GtkStatusIcon *init_notification(void)
+ {
+ 	notify_init("bluetooth-manager");
+ 
+-	statusicon = gtk_status_icon_new();
+-	g_object_unref(statusicon);
+-
+ 	statusicon = gtk_status_icon_new_from_icon_name("bluetooth");
+ 
+ 	//gtk_status_icon_set_tooltip(statusicon, _("Bluetooth Manager"));