[Pkg-bluetooth-commits] r754 - in /packages/bluez-utils/branches/experimental/3.36-1exp1/debian: changelog patches/001_fix_plugin_disabling.diff

[filippo at users.alioth.debian.org]

Author: filippo
Date: Sat Sep  6 09:25:20 2008
New Revision: 754

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=754
Log:
Fix disabling of plugins (debian/patches/001_fix_plugin_disabling.diff)

Added:
    packages/bluez-utils/branches/experimental/3.36-1exp1/debian/patches/001_fix_plugin_disabling.diff
Modified:
    packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog

Modified: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog?rev=754&op=diff
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog (original)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/changelog Sat Sep  6 09:25:20 2008
@@ -1,3 +1,9 @@
+bluez-utils (3.36-1exp1) experimental; urgency=low
+
+  * Fix disabling of plugins (debian/patches/001_fix_plugin_disabling.diff)
+
+ -- Filippo Giunchedi <filippo at debian.org>  Sat, 06 Sep 2008 10:33:50 +0200
+
 bluez-utils (3.36-1) unstable; urgency=medium
 
   * New upstream version

Added: packages/bluez-utils/branches/experimental/3.36-1exp1/debian/patches/001_fix_plugin_disabling.diff
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/branches/experimental/3.36-1exp1/debian/patches/001_fix_plugin_disabling.diff?rev=754&op=file
==============================================================================
--- packages/bluez-utils/branches/experimental/3.36-1exp1/debian/patches/001_fix_plugin_disabling.diff (added)
+++ packages/bluez-utils/branches/experimental/3.36-1exp1/debian/patches/001_fix_plugin_disabling.diff Sat Sep  6 09:25:20 2008
@@ -1,0 +1,25 @@
+diff --git a/hcid/plugin.c b/hcid/plugin.c
+index 331a832..ee6f0d0 100644
+--- a/hcid/plugin.c
++++ b/hcid/plugin.c
+@@ -72,7 +72,7 @@ static gboolean is_disabled(const char *name, char **list)
+ 		char *str;
+ 		gboolean equal;
+ 
+-		str = g_strdup_printf("lib%s.so", list[i]);
++		str = g_strdup_printf("%s.so", list[i]);
+ 
+ 		equal = g_str_equal(str, name);
+ 
+@@ -119,8 +119,10 @@ gboolean plugin_init(GKeyFile *config)
+ 				g_str_has_suffix(file, ".so") == FALSE)
+ 			continue;
+ 
+-		if (disabled && is_disabled(file, disabled))
++		if (disabled && is_disabled(file, disabled)) {
++			debug("Skipping disabled plugin %s", file);
+ 			continue;
++		}
+ 
+ 		filename = g_build_filename(PLUGINDIR, file, NULL);
+