diff -Nru bluez-tools-2.0~20170911.0.7cb788c/debian/changelog bluez-tools-2.0~20170911.0.7cb788c/debian/changelog --- bluez-tools-2.0~20170911.0.7cb788c/debian/changelog 2019-01-14 19:58:16.000000000 +0000 +++ bluez-tools-2.0~20170911.0.7cb788c/debian/changelog 2020-08-12 02:44:57.000000000 +0000 @@ -1,8 +1,17 @@ -bluez-tools (2.0~20170911.0.7cb788c-2build1) disco; urgency=medium +bluez-tools (2.0~20170911.0.7cb788c-4) unstable; urgency=medium - * No-change rebuild for readline soname change. + * Drop needless libdbus-glib-1-dev, autotools-dev and dh-autoreconf from + B-D. (Closes: #955824) + * Add libglib2.0-dev to B-D. - -- Matthias Klose Mon, 14 Jan 2019 19:58:16 +0000 + -- Nobuhiro Iwamatsu Wed, 12 Aug 2020 11:44:57 +0900 + +bluez-tools (2.0~20170911.0.7cb788c-3) unstable; urgency=medium + + * Fix build with gcc-10. (Closes: #957049) + Add ./debian/patches/0001-Fix-build-with-gcc-10.patch. + + -- Nobuhiro Iwamatsu Wed, 12 Aug 2020 11:33:44 +0900 bluez-tools (2.0~20170911.0.7cb788c-2) unstable; urgency=medium diff -Nru bluez-tools-2.0~20170911.0.7cb788c/debian/control bluez-tools-2.0~20170911.0.7cb788c/debian/control --- bluez-tools-2.0~20170911.0.7cb788c/debian/control 2018-05-24 22:35:23.000000000 +0000 +++ bluez-tools-2.0~20170911.0.7cb788c/debian/control 2020-08-12 02:44:57.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Bluetooth Maintainers Uploaders: Nobuhiro Iwamatsu -Build-Depends: debhelper (>= 11), autotools-dev, libbluetooth-dev (>= 5), - libreadline-dev, libdbus-1-dev, libdbus-glib-1-dev, dh-autoreconf +Build-Depends: debhelper (>= 11), libbluetooth-dev (>= 5), + libreadline-dev, libdbus-1-dev, libglib2.0-dev Standards-Version: 4.1.4 Homepage: https://github.com/khvzak/bluez-tools Vcs-Git: https://salsa.debian.org/bluetooth-team/bluez-tools.git diff -Nru bluez-tools-2.0~20170911.0.7cb788c/debian/patches/0001-Fix-build-with-gcc-10.patch bluez-tools-2.0~20170911.0.7cb788c/debian/patches/0001-Fix-build-with-gcc-10.patch --- bluez-tools-2.0~20170911.0.7cb788c/debian/patches/0001-Fix-build-with-gcc-10.patch 1970-01-01 00:00:00.000000000 +0000 +++ bluez-tools-2.0~20170911.0.7cb788c/debian/patches/0001-Fix-build-with-gcc-10.patch 2020-08-12 02:44:57.000000000 +0000 @@ -0,0 +1,47 @@ +From d605f17fc9d00bf86f16cef1a5eb869c81d1410f Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Wed, 12 Aug 2020 11:32:58 +0900 +Subject: [PATCH] Fix build with gcc-10 + +Signed-off-by: Nobuhiro Iwamatsu +--- + src/lib/agent-helper.c | 2 ++ + src/lib/agent-helper.h | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/agent-helper.c b/src/lib/agent-helper.c +index bf50bcc..2b94100 100644 +--- a/src/lib/agent-helper.c ++++ b/src/lib/agent-helper.c +@@ -33,6 +33,8 @@ + + #include "agent-helper.h" + ++gboolean agent_need_unregister; ++ + static const gchar *_bt_agent_introspect_xml = "\n\t\n\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\n\n"; + static guint _bt_agent_registration_id = 0; + static GHashTable *_pin_hash_table = NULL; +diff --git a/src/lib/agent-helper.h b/src/lib/agent-helper.h +index 8e1cc85..9a952c4 100644 +--- a/src/lib/agent-helper.h ++++ b/src/lib/agent-helper.h +@@ -35,7 +35,7 @@ extern "C" { + #define AGENT_DBUS_INTERFACE "org.bluez.Agent1" + #define AGENT_PATH "/org/blueztools" + +-gboolean agent_need_unregister; ++extern gboolean agent_need_unregister; + + void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error); + void unregister_agent_callbacks(GError **error); +@@ -44,4 +44,4 @@ void unregister_agent_callbacks(GError **error); + } + #endif + +-#endif /* __AGENT_HELPER_H */ +\ No newline at end of file ++#endif /* __AGENT_HELPER_H */ +-- +2.28.0 + diff -Nru bluez-tools-2.0~20170911.0.7cb788c/debian/patches/series bluez-tools-2.0~20170911.0.7cb788c/debian/patches/series --- bluez-tools-2.0~20170911.0.7cb788c/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ bluez-tools-2.0~20170911.0.7cb788c/debian/patches/series 2020-08-12 02:44:57.000000000 +0000 @@ -0,0 +1 @@ +0001-Fix-build-with-gcc-10.patch