[Pkg-bluetooth-commits] r980 - in /packages/bluez/trunk/debian: bluez.install changelog libbluetooth-dev.install patches/02_disable_hal.patch rules
iwamatsu at users.alioth.debian.org
iwamatsu at users.alioth.debian.org
Thu Dec 2 07:38:45 UTC 2010
Author: iwamatsu
Date: Thu Dec 2 07:38:43 2010
New Revision: 980
URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=980
Log:
* Update debian/changelog
* Disabled HAL (Closes: 599023).
Add patches/02_disable_hal.patch
* Update debian/rules
- Remove --enable-netlink option of configure.
This option was not provided.
* Update debian/bluez.install
Remove path of plugins.
* Update libbluetooth-dev.install
Remove path of plugins.
Added:
packages/bluez/trunk/debian/patches/02_disable_hal.patch
Modified:
packages/bluez/trunk/debian/bluez.install
packages/bluez/trunk/debian/changelog
packages/bluez/trunk/debian/libbluetooth-dev.install
packages/bluez/trunk/debian/rules
Modified: packages/bluez/trunk/debian/bluez.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.install?rev=980&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.install (original)
+++ packages/bluez/trunk/debian/bluez.install Thu Dec 2 07:38:43 2010
@@ -4,4 +4,3 @@
debian/tmp/usr/sbin/*
debian/tmp/usr/bin/*
debian/tmp/usr/share/man/man*
-debian/tmp/usr/lib/bluetooth/plugins/*.so
Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=980&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Thu Dec 2 07:38:43 2010
@@ -2,10 +2,18 @@
* New upstream release.
* Drop patches/010_udev_rules_agent.patch (Closes: ##588034).
- Connection of bluetooth is cut off after system start, if applied this patch.
- And this patch is not already necessary.
+ Connection of bluetooth is cut off after system start,
+ if applied this patch. And this patch is not already necessary.
+ * Disabled HAL (Closes: 599023).
+ Add patches/02_disable_hal.patch
* Update debian/rules
- Provide again bluetooth-agent utility (Closes: #598982).
+ - Remove --enable-netlink option of configure.
+ This option was not provided.
+ * Update debian/bluez.install
+ Remove path of plugins.
+ * Update libbluetooth-dev.install
+ Remove path of plugins.
-- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 02 Dec 2010 12:17:48 +0900
Modified: packages/bluez/trunk/debian/libbluetooth-dev.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/libbluetooth-dev.install?rev=980&op=diff
==============================================================================
--- packages/bluez/trunk/debian/libbluetooth-dev.install (original)
+++ packages/bluez/trunk/debian/libbluetooth-dev.install Thu Dec 2 07:38:43 2010
@@ -2,4 +2,3 @@
debian/tmp/usr/lib/lib*.so
debian/tmp/usr/lib/*.la
debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/bluetooth/plugins/*.la
Added: packages/bluez/trunk/debian/patches/02_disable_hal.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/02_disable_hal.patch?rev=980&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/02_disable_hal.patch (added)
+++ packages/bluez/trunk/debian/patches/02_disable_hal.patch Thu Dec 2 07:38:43 2010
@@ -1,0 +1,175 @@
+Description: Disable usage of Hal in the telephony plugins, and disable the hal plugin. They do not do very useful things anyway, and just cause hal to start up, which is expensive.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Origin: Ubuntu
+Updated by Michael Biebl <biebl at debian.org>
+Updated by Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599023
+
+diff --git a/audio/telephony-maemo5.c b/audio/telephony-maemo5.c
+index 4d0134c..a1547d3 100644
+--- a/audio/telephony-maemo5.c
++++ b/audio/telephony-maemo5.c
+@@ -1395,6 +1395,7 @@ static gboolean iter_get_basic_args(DBusMessageIter *iter,
+ return type == DBUS_TYPE_INVALID ? TRUE : FALSE;
+ }
+
++#if 0 /* Disable hal */
+ static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
+ {
+ DBusError err;
+@@ -1511,6 +1512,7 @@ static void handle_hal_property_modified(DBusMessage *msg)
+ dbus_message_iter_next(&array);
+ }
+ }
++#endif /* Disable hal */
+
+ static void csd_call_free(struct csd_call *call)
+ {
+@@ -1725,6 +1727,7 @@ done:
+ dbus_message_unref(reply);
+ }
+
++#if 0 /* Disable hal */
+ static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
+ {
+ DBusError err;
+@@ -1778,6 +1781,7 @@ static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
+ done:
+ dbus_message_unref(reply);
+ }
++#endif /* Disable hal */
+
+ static void phonebook_read_reply(DBusPendingCall *call, void *user_data)
+ {
+@@ -2034,9 +2038,11 @@ static DBusHandlerResult signal_filter(DBusConnection *conn,
+ else if (dbus_message_is_signal(msg, NETWORK_INTERFACE,
+ "signal_strength_change"))
+ handle_signal_strength_change(msg);
++#if 0 /* Disable hal */
+ else if (dbus_message_is_signal(msg, "org.freedesktop.Hal.Device",
+ "PropertyModified"))
+ handle_hal_property_modified(msg);
++#endif /* Disable hal */
+ else if (dbus_message_is_signal(msg, SSC_DBUS_IFACE,
+ "modem_state_changed_ind"))
+ handle_modem_state(msg);
+@@ -2093,6 +2099,7 @@ int telephony_init(void)
+
+ telephony_ready_ind(features, maemo_indicators, response_and_hold,
+ chld_str);
++#if 0 /* Disable hal */
+ if (send_method_call("org.freedesktop.Hal",
+ "/org/freedesktop/Hal/Manager",
+ "org.freedesktop.Hal.Manager",
+@@ -2101,7 +2108,7 @@ int telephony_init(void)
+ DBUS_TYPE_STRING, &battery_cap,
+ DBUS_TYPE_INVALID) < 0)
+ error("Unable to send HAL method call");
+-
++#endif /* Disable hal */
+ return 0;
+ }
+
+diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
+index f671a42..14adbd6 100644
+--- a/audio/telephony-maemo6.c
++++ b/audio/telephony-maemo6.c
+@@ -1319,6 +1319,7 @@ static void remove_pending(DBusPendingCall *call)
+ dbus_pending_call_unref(call);
+ }
+
++#if 0 /* Disable hal */
+ static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
+ {
+ DBusError err;
+@@ -1434,6 +1435,7 @@ static void handle_hal_property_modified(DBusMessage *msg)
+ dbus_message_iter_next(&array);
+ }
+ }
++#endif /* Disable hal */
+
+ static void csd_call_free(struct csd_call *call)
+ {
+@@ -1885,9 +1887,11 @@ static gboolean signal_filter(DBusConnection *conn, DBusMessage *msg,
+ else if (dbus_message_is_signal(msg, CSD_CSNET_SIGNAL,
+ "SignalBarsChanged"))
+ handle_signal_bars_changed(msg);
++#if 0 /* Disable hal */
+ else if (dbus_message_is_signal(msg, "org.freedesktop.Hal.Device",
+ "PropertyModified"))
+ handle_hal_property_modified(msg);
++#endif
+ else if (dbus_message_is_signal(msg, SSC_DBUS_IFACE,
+ "modem_state_changed_ind"))
+ handle_modem_state(msg);
+@@ -1906,6 +1910,7 @@ static void add_watch(const char *sender, const char *path,
+ watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
+ }
+
++#if 0 /* Disable hal */
+ static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
+ {
+ DBusError err;
+@@ -1956,6 +1961,8 @@ done:
+ remove_pending(call);
+ }
+
++#endif /* Disable hal */
++
+ int telephony_init(void)
+ {
+ const char *battery_cap = "battery";
+@@ -1999,6 +2006,7 @@ int telephony_init(void)
+
+ telephony_ready_ind(features, maemo_indicators, response_and_hold,
+ chld_str);
++#if 0 /* Disable hal */
+ if (send_method_call("org.freedesktop.Hal",
+ "/org/freedesktop/Hal/Manager",
+ "org.freedesktop.Hal.Manager",
+@@ -2007,7 +2015,7 @@ int telephony_init(void)
+ DBUS_TYPE_STRING, &battery_cap,
+ DBUS_TYPE_INVALID) < 0)
+ error("Unable to send HAL method call");
+-
++#endif
+ return 0;
+ }
+
+diff --git a/audio/telephony-ofono.c b/audio/telephony-ofono.c
+index 693207c..e104bd6 100644
+--- a/audio/telephony-ofono.c
++++ b/audio/telephony-ofono.c
+@@ -889,6 +889,7 @@ static gboolean handle_vcmanager_property_changed(DBusConnection *conn,
+ return TRUE;
+ }
+
++#if 0 /* Disable hal */
+ static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
+ {
+ DBusMessage *reply;
+@@ -1061,6 +1062,7 @@ static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
+ done:
+ dbus_message_unref(reply);
+ }
++#endif /* Disable hal */
+
+ int telephony_init(void)
+ {
+@@ -1087,6 +1089,7 @@ int telephony_init(void)
+ if (ret < 0)
+ return ret;
+
++#if 0 /* Disable hal */
+ ret = send_method_call("org.freedesktop.Hal",
+ "/org/freedesktop/Hal/Manager",
+ "org.freedesktop.Hal.Manager",
+@@ -1096,7 +1099,7 @@ int telephony_init(void)
+ DBUS_TYPE_INVALID);
+ if (ret < 0)
+ return ret;
+-
++#endif
+ DBG("telephony_init() successfully");
+
+ return ret;
Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=980&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Thu Dec 2 07:38:43 2010
@@ -11,7 +11,6 @@
DEB_CONFIGURE_EXTRA_FLAGS := --enable-gstreamer \
--enable-alsa \
--enable-usb \
- --enable-netlink \
--enable-tools \
--enable-test \
--enable-bccmd \
More information about the Pkg-bluetooth-commits
mailing list