[Pkg-bluetooth-commits] r1107 - in /packages/bluez/trunk/debian: changelog control patches/01_lower_sink_ranking.patch patches/02_disable_hal.patch patches/03-Fix-return-code-of-hid2hci.patch patches/06-alsalib.patch patches/series rules source/format
iwamatsu at users.alioth.debian.org
iwamatsu at users.alioth.debian.org
Wed Aug 10 03:03:03 UTC 2011
Author: iwamatsu
Date: Wed Aug 10 03:03:01 2011
New Revision: 1107
URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1107
Log:
* Drop patchsys-quilt.mk snippet: superfluous with source
format 3.0 "(quilt)".
* Refresh patch.
Added:
packages/bluez/trunk/debian/patches/series
Modified:
packages/bluez/trunk/debian/changelog
packages/bluez/trunk/debian/control
packages/bluez/trunk/debian/patches/01_lower_sink_ranking.patch
packages/bluez/trunk/debian/patches/02_disable_hal.patch
packages/bluez/trunk/debian/patches/03-Fix-return-code-of-hid2hci.patch
packages/bluez/trunk/debian/patches/06-alsalib.patch
packages/bluez/trunk/debian/rules
packages/bluez/trunk/debian/source/format
Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Wed Aug 10 03:03:01 2011
@@ -4,6 +4,9 @@
* Update debian/control.
- Updated Architecture from some architecture to linux-any.
(Closes: #636545)
+ * Drop patchsys-quilt.mk snippet: superfluous with source
+ format 3.0 "(quilt)".
+ * Refresh patch.
-- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 04 Aug 2011 11:46:35 +0900
Modified: packages/bluez/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/control?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/control (original)
+++ packages/bluez/trunk/debian/control Wed Aug 10 03:03:01 2011
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
Uploaders: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
dh-autoreconf(>= 4),
autotools-dev,
cdbs,
Modified: packages/bluez/trunk/debian/patches/01_lower_sink_ranking.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/01_lower_sink_ranking.patch?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/patches/01_lower_sink_ranking.patch (original)
+++ packages/bluez/trunk/debian/patches/01_lower_sink_ranking.patch Wed Aug 10 03:03:01 2011
@@ -1,9 +1,14 @@
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571595
+Description: a2dpsink should have a rank < GST_RANK_MARGINAL
+Author: Sebastian Dröge <slomo at circular-chaos.org>
+Origin: Sebastian Dröge <slomo at circular-chaos.org>
+Updated by Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571595
+
diff --git a/audio/gsta2dpsink.c b/audio/gsta2dpsink.c
-index 52b65e5..89794fb 100644
+index 930d14e..b7ec67c 100644
--- a/audio/gsta2dpsink.c
+++ b/audio/gsta2dpsink.c
-@@ -697,6 +697,6 @@ static void gst_a2dp_sink_init(GstA2dpSink *self,
+@@ -725,6 +725,6 @@ static void gst_a2dp_sink_init(GstA2dpSink *self,
gboolean gst_a2dp_sink_plugin_init(GstPlugin *plugin)
{
return gst_element_register(plugin, "a2dpsink",
@@ -11,3 +16,6 @@
+ GST_RANK_MARGINAL-1, GST_TYPE_A2DP_SINK);
}
+--
+1.7.5.4
+
Modified: 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=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/patches/02_disable_hal.patch (original)
+++ packages/bluez/trunk/debian/patches/02_disable_hal.patch Wed Aug 10 03:03:01 2011
@@ -6,10 +6,10 @@
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
+index 350df9e..a97137c 100644
--- a/audio/telephony-maemo5.c
+++ b/audio/telephony-maemo5.c
-@@ -1395,6 +1395,7 @@ static gboolean iter_get_basic_args(DBusMessageIter *iter,
+@@ -1385,6 +1385,7 @@ static gboolean iter_get_basic_args(DBusMessageIter *iter,
return type == DBUS_TYPE_INVALID ? TRUE : FALSE;
}
@@ -17,7 +17,7 @@
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)
+@@ -1501,6 +1502,7 @@ static void handle_hal_property_modified(DBusMessage *msg)
dbus_message_iter_next(&array);
}
}
@@ -25,7 +25,7 @@
static void csd_call_free(struct csd_call *call)
{
-@@ -1725,6 +1727,7 @@ done:
+@@ -1715,6 +1717,7 @@ done:
dbus_message_unref(reply);
}
@@ -33,7 +33,7 @@
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)
+@@ -1768,6 +1771,7 @@ static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
done:
dbus_message_unref(reply);
}
@@ -41,7 +41,7 @@
static void phonebook_read_reply(DBusPendingCall *call, void *user_data)
{
-@@ -2034,9 +2038,11 @@ static DBusHandlerResult signal_filter(DBusConnection *conn,
+@@ -2018,9 +2022,11 @@ static DBusHandlerResult signal_filter(DBusConnection *conn,
else if (dbus_message_is_signal(msg, NETWORK_INTERFACE,
"signal_strength_change"))
handle_signal_strength_change(msg);
@@ -53,15 +53,15 @@
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)
+@@ -2077,6 +2083,7 @@ int telephony_init(void)
- telephony_ready_ind(features, maemo_indicators, response_and_hold,
+ telephony_ready_ind(features, maemo_indicators, BTRH_NOT_SUPPORTED,
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)
+@@ -2085,7 +2092,7 @@ int telephony_init(void)
DBUS_TYPE_STRING, &battery_cap,
DBUS_TYPE_INVALID) < 0)
error("Unable to send HAL method call");
@@ -71,26 +71,26 @@
}
diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
-index f671a42..14adbd6 100644
+index 4430cc1..ab098fb 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);
+@@ -1375,6 +1375,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;
-@@ -1434,6 +1435,7 @@ static void handle_hal_property_modified(DBusMessage *msg)
+@@ -1490,6 +1491,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)
+ static void csd_call_free(void *data)
{
-@@ -1885,9 +1887,11 @@ static gboolean signal_filter(DBusConnection *conn, DBusMessage *msg,
+@@ -1842,9 +1844,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);
@@ -102,7 +102,7 @@
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,
+@@ -1863,6 +1867,7 @@ static void add_watch(const char *sender, const char *path,
watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
}
@@ -110,7 +110,7 @@
static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
{
DBusError err;
-@@ -1956,6 +1961,8 @@ done:
+@@ -1913,6 +1918,8 @@ done:
remove_pending(call);
}
@@ -119,15 +119,15 @@
int telephony_init(void)
{
const char *battery_cap = "battery";
-@@ -1999,6 +2006,7 @@ int telephony_init(void)
+@@ -1952,6 +1959,7 @@ int telephony_init(void)
- telephony_ready_ind(features, maemo_indicators, response_and_hold,
+ telephony_ready_ind(features, maemo_indicators, BTRH_NOT_SUPPORTED,
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)
+@@ -1960,7 +1968,7 @@ int telephony_init(void)
DBUS_TYPE_STRING, &battery_cap,
DBUS_TYPE_INVALID) < 0)
error("Unable to send HAL method call");
@@ -137,10 +137,10 @@
}
diff --git a/audio/telephony-ofono.c b/audio/telephony-ofono.c
-index 693207c..e104bd6 100644
+index 26815cf..175effa 100644
--- a/audio/telephony-ofono.c
+++ b/audio/telephony-ofono.c
-@@ -889,6 +889,7 @@ static gboolean handle_vcmanager_property_changed(DBusConnection *conn,
+@@ -1344,6 +1344,7 @@ static gboolean handle_manager_modem_removed(DBusConnection *conn,
return TRUE;
}
@@ -148,23 +148,23 @@
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:
+@@ -1527,6 +1528,7 @@ done:
dbus_message_unref(reply);
+ remove_pending(call);
}
+#endif /* Disable hal */
- int telephony_init(void)
+ static void handle_service_connect(DBusConnection *conn, void *user_data)
{
-@@ -1087,6 +1089,7 @@ int telephony_init(void)
- if (ret < 0)
- return ret;
+@@ -1582,6 +1584,7 @@ int telephony_init(void)
+
+ watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
+#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)
+@@ -1591,7 +1594,7 @@ int telephony_init(void)
DBUS_TYPE_INVALID);
if (ret < 0)
return ret;
@@ -172,4 +172,7 @@
+#endif
DBG("telephony_init() successfully");
- return ret;
+ telephony_ready_ind(features, ofono_indicators, BTRH_NOT_SUPPORTED,
+--
+1.7.5.4
+
Modified: packages/bluez/trunk/debian/patches/03-Fix-return-code-of-hid2hci.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/03-Fix-return-code-of-hid2hci.patch?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/patches/03-Fix-return-code-of-hid2hci.patch (original)
+++ packages/bluez/trunk/debian/patches/03-Fix-return-code-of-hid2hci.patch Wed Aug 10 03:03:01 2011
@@ -1,13 +1,7 @@
-From 244c2206d5ff0893f7500e17dc30af98ce779fec Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Date: Thu, 9 Jun 2011 12:54:17 +0900
-Subject: [PATCH] Fix return code of hid2hci
-
-hid2hci already return 1.
-This set 0 to default retuen code and add error code.
----
- tools/hid2hci.c | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
+Description: bluez: getting a "Logitech, Inc. diNovo Edge Keyboard" working
+Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Origin: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626975
diff --git a/tools/hid2hci.c b/tools/hid2hci.c
index 45a3a3d..da278cb 100644
@@ -65,5 +59,5 @@
}
err = hid_switch_logitech(device);
--
-1.7.5.3
+1.7.5.4
Modified: packages/bluez/trunk/debian/patches/06-alsalib.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/06-alsalib.patch?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/patches/06-alsalib.patch (original)
+++ packages/bluez/trunk/debian/patches/06-alsalib.patch Wed Aug 10 03:03:01 2011
@@ -1,19 +1,14 @@
-From 66518113dc26fe470510bc44ef113c70c9edb7b9 Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Date: Sun, 24 Jul 2011 18:30:08 +0900
-Subject: [PATCH 2/2] alsalib-patch
-
-Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
----
- Makefile.am | 2 +-
- acinclude.m4 | 2 ++
- 2 files changed, 3 insertions(+), 1 deletions(-)
+Description: Please install ALSA plugin in the multiarch directory
+Author: Steve Langasek <steve.langasek at canonical.com>
+Origin: Steve Langasek <steve.langasek at canonical.com>
+Updated by Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634976
diff --git a/Makefile.am b/Makefile.am
-index 4659c80..afe1da7 100644
+index 7eadf82..ba24c22 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -280,7 +280,7 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
+@@ -309,7 +309,7 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
if ALSA
@@ -23,10 +18,10 @@
alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
audio/libasound_module_ctl_bluetooth.la
diff --git a/acinclude.m4 b/acinclude.m4
-index d77937b..40e0b40 100644
+index 3cb9459..6d76c0c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -132,6 +132,8 @@ AC_DEFUN([AC_PATH_ALSA], [
+@@ -135,6 +135,8 @@ AC_DEFUN([AC_PATH_ALSA], [
AC_CHECK_LIB(rt, clock_gettime, ALSA_LIBS="$ALSA_LIBS -lrt", alsa_found=no)
AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS)
Added: packages/bluez/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/series?rev=1107&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/series (added)
+++ packages/bluez/trunk/debian/patches/series Wed Aug 10 03:03:01 2011
@@ -1,0 +1,4 @@
+01_lower_sink_ranking.patch
+02_disable_hal.patch
+03-Fix-return-code-of-hid2hci.patch
+06-alsalib.patch
Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Wed Aug 10 03:03:01 2011
@@ -3,11 +3,12 @@
include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
-DEB_DH_AUTORECONF_ARGS = "-ivf"
+DEB_DH_AUTORECONF_ARGS = --as-needed
+#DEB_DH_AUTORECONF_ARGS = "-ivf"
DEB_UPDATE_RCD_PARAMS = "start 25 2 3 4 5 . stop 74 0 1 6 ."
DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
DEB_CONFIGURE_EXTRA_FLAGS := --enable-health \
Modified: packages/bluez/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/source/format?rev=1107&op=diff
==============================================================================
--- packages/bluez/trunk/debian/source/format (original)
+++ packages/bluez/trunk/debian/source/format Wed Aug 10 03:03:01 2011
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)
More information about the Pkg-bluetooth-commits
mailing list