diff -Nru libgusb-0.3.4/debian/changelog libgusb-0.3.4/debian/changelog --- libgusb-0.3.4/debian/changelog 2020-03-10 10:23:36.000000000 +0000 +++ libgusb-0.3.4/debian/changelog 2020-03-17 22:58:47.000000000 +0000 @@ -1,18 +1,8 @@ -libgusb (0.3.4-0ubuntu1) focal; urgency=medium +libgusb (0.3.4-0.1) unstable; urgency=medium - * New upstream version, rebased on the Debian Vcs packaging - * debian/control: - - Breaks fwupd (<= 1.3.9-1), that ones needs a rebuild, see bellow - * debian/patches/01_fix_symver.patch: - - remove, the fix is in the new version - - [ Laurent Bigonville ] * Non-maintainer upload. + [ Laurent Bigonville ] * New upstream version (Closes: #948546) - * Drop debian/patches/revert-versioning.patch, upstream doesn't want to - merge it and we cannot carry it forever. The number of rdependencies - impacted is small so bite the bullet this time and request binNMU for it, - update the .symbols file accordingly. * debian/control: Drop libgudev-1.0-dev from the libgusb-dev dependencies and replace it with libglib2.0-dev. (Closes: #951055) * Make gir1.2-gusb-1.0 package Multi-arch: same @@ -24,8 +14,15 @@ * Fix path to the file containing the usb ids and recommend the package shipping it * debian/watch: Switch to https to please lintian + * Refresh debian/patches/revert-versioning.patch for the 0.3.4 release + + [ Simon McVittie ] + * New upstream version + - Drop debian/patches/01_fix_symver.patch, no longer necessary + * d/p/generate-version-script-Don-t-skip-methods-on-plain-struc.patch: + Revert accidental removal of g_usb_source_set_callback from the ABI - -- Sebastien Bacher Tue, 10 Mar 2020 11:23:36 +0100 + -- Laurent Bigonville Tue, 17 Mar 2020 23:58:47 +0100 libgusb (0.3.0-1) unstable; urgency=medium diff -Nru libgusb-0.3.4/debian/control libgusb-0.3.4/debian/control --- libgusb-0.3.4/debian/control 2020-03-09 10:24:08.000000000 +0000 +++ libgusb-0.3.4/debian/control 2020-03-17 22:58:47.000000000 +0000 @@ -1,6 +1,5 @@ Source: libgusb -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Michal Čihař +Maintainer: Michal Čihař Section: libs Priority: optional Build-Depends: debhelper (>= 11), @@ -55,7 +54,6 @@ ${misc:Depends} Recommends: usb.ids Pre-Depends: ${misc:Pre-Depends} -Breaks: fwupd (<= 1.3.9-1) Description: GLib wrapper around libusb1 GUsb is a GObject wrapper for libusb1 that makes it easy to do asynchronous control, bulk and interrupt transfers with proper diff -Nru libgusb-0.3.4/debian/libgusb2.symbols libgusb-0.3.4/debian/libgusb2.symbols --- libgusb-0.3.4/debian/libgusb2.symbols 2020-03-09 10:39:23.000000000 +0000 +++ libgusb-0.3.4/debian/libgusb2.symbols 2020-03-17 22:58:47.000000000 +0000 @@ -7,8 +7,6 @@ LIBGUSB_0.2.2@LIBGUSB_0.2.2 0.2.2 LIBGUSB_0.2.4@LIBGUSB_0.2.4 0.2.4 LIBGUSB_0.2.5@LIBGUSB_0.2.5 0.2.5 - LIBGUSB_0.2.8@LIBGUSB_0.2.8 0.2.8 - LIBGUSB_0.2.9@LIBGUSB_0.2.9 0.2.9 LIBGUSB_0.3.1@LIBGUSB_0.3.1 0.3.1 LIBGUSB_0.3.3@LIBGUSB_0.3.3 0.3.3 g_usb_context_enumerate@LIBGUSB_0.2.2 0.2.2 @@ -18,14 +16,14 @@ g_usb_context_find_by_vid_pid@LIBGUSB_0.2.2 0.2.2 g_usb_context_get_devices@LIBGUSB_0.2.2 0.2.2 g_usb_context_get_flags@LIBGUSB_0.2.11 0.2.11 - g_usb_context_get_main_context@LIBGUSB_0.2.5 0.3.3 + g_usb_context_get_main_context@LIBGUSB_0.1.0 0.1.0 g_usb_context_get_source@LIBGUSB_0.1.0 0.1.0 g_usb_context_get_type@LIBGUSB_0.1.0 0.1.0 g_usb_context_new@LIBGUSB_0.1.0 0.1.0 g_usb_context_set_debug@LIBGUSB_0.1.0 0.1.0 g_usb_context_set_flags@LIBGUSB_0.2.11 0.2.11 - g_usb_context_set_main_context@LIBGUSB_0.2.5 0.3.3 - g_usb_context_wait_for_replug@LIBGUSB_0.2.9 0.3.3 + g_usb_context_set_main_context@LIBGUSB_0.1.0 0.1.0 + g_usb_context_wait_for_replug@LIBGUSB_0.1.0 0.2.10 g_usb_device_bulk_transfer@LIBGUSB_0.1.0 0.1.0 g_usb_device_bulk_transfer_async@LIBGUSB_0.1.0 0.1.0 g_usb_device_bulk_transfer_finish@LIBGUSB_0.1.0 0.1.0 @@ -43,8 +41,8 @@ g_usb_device_get_device_class@LIBGUSB_0.1.7 0.1.7 g_usb_device_get_device_protocol@LIBGUSB_0.2.4 0.2.4 g_usb_device_get_device_subclass@LIBGUSB_0.2.4 0.2.4 - g_usb_device_get_interface@LIBGUSB_0.2.8 0.3.3 - g_usb_device_get_interfaces@LIBGUSB_0.2.8 0.3.3 + g_usb_device_get_interface@LIBGUSB_0.1.0 0.2.8 + g_usb_device_get_interfaces@LIBGUSB_0.1.0 0.2.8 g_usb_device_get_manufacturer_index@LIBGUSB_0.1.0 0.1.0 g_usb_device_get_parent@LIBGUSB_0.2.4 0.2.4 g_usb_device_get_pid@LIBGUSB_0.1.0 0.1.0 @@ -52,7 +50,7 @@ g_usb_device_get_platform_id@LIBGUSB_0.1.1 0.1.1 g_usb_device_get_port_number@LIBGUSB_0.2.4 0.2.4 g_usb_device_get_product_index@LIBGUSB_0.1.0 0.1.0 - g_usb_device_get_release@LIBGUSB_0.2.8 0.3.3 + g_usb_device_get_release@LIBGUSB_0.1.0 0.2.8 g_usb_device_get_serial_number_index@LIBGUSB_0.1.0 0.1.0 g_usb_device_get_spec@LIBGUSB_0.3.1 0.3.1 g_usb_device_get_string_descriptor@LIBGUSB_0.1.0 0.1.0 @@ -72,7 +70,7 @@ g_usb_device_release_interface@LIBGUSB_0.1.0 0.1.0 g_usb_device_reset@LIBGUSB_0.1.0 0.1.0 g_usb_device_set_configuration@LIBGUSB_0.1.0 0.1.0 - g_usb_device_set_interface_alt@LIBGUSB_0.2.8 0.3.3 + g_usb_device_set_interface_alt@LIBGUSB_0.1.0 0.2.8 g_usb_endpoint_get_address@LIBGUSB_0.3.3 0.3.3 g_usb_endpoint_get_direction@LIBGUSB_0.3.3 0.3.3 g_usb_endpoint_get_extra@LIBGUSB_0.3.3 0.3.3 @@ -83,17 +81,18 @@ g_usb_endpoint_get_refresh@LIBGUSB_0.3.3 0.3.3 g_usb_endpoint_get_synch_address@LIBGUSB_0.3.3 0.3.3 g_usb_endpoint_get_type@LIBGUSB_0.3.3 0.3.3 - g_usb_interface_get_alternate@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_class@LIBGUSB_0.2.8 0.3.3 + g_usb_interface_get_alternate@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_class@LIBGUSB_0.1.0 0.2.8 g_usb_interface_get_endpoints@LIBGUSB_0.3.3 0.3.3 - g_usb_interface_get_extra@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_index@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_kind@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_length@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_number@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_protocol@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_subclass@LIBGUSB_0.2.8 0.3.3 - g_usb_interface_get_type@LIBGUSB_0.2.8 0.3.4 + g_usb_interface_get_extra@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_index@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_kind@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_length@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_number@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_protocol@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_subclass@LIBGUSB_0.1.0 0.2.8 + g_usb_interface_get_type@LIBGUSB_0.1.0 0.2.8 g_usb_source_error_quark@LIBGUSB_0.1.0 0.1.0 + g_usb_source_set_callback@LIBGUSB_0.1.0 0.1.0 g_usb_strerror@LIBGUSB_0.1.0 0.1.0 g_usb_version_string@LIBGUSB_0.3.1 0.3.1 diff -Nru libgusb-0.3.4/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch libgusb-0.3.4/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch --- libgusb-0.3.4/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgusb-0.3.4/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch 2020-03-17 22:58:47.000000000 +0000 @@ -0,0 +1,47 @@ +From: Simon McVittie +Date: Wed, 4 Mar 2020 10:21:37 +0000 +Subject: generate-version-script: Don't skip methods on plain structs + +This resulted in losing g_usb_source_set_callback@LIBGUSB_0.1.0 from +the ABI in version 0.3.4. + +Signed-off-by: Simon McVittie +Forwarded: https://github.com/hughsie/libgusb/pull/31 +--- + contrib/generate-version-script.py | 7 ++++--- + gusb/libgusb.ver | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +--- a/contrib/generate-version-script.py ++++ b/contrib/generate-version-script.py +@@ -50,9 +50,6 @@ class LdVersionScript: + + # choose the lowest version method for the _get_type symbol + version_lowest = None +- if '{http://www.gtk.org/introspection/glib/1.0}get-type' not in cls.attrib: +- return +- type_name = cls.attrib['{http://www.gtk.org/introspection/glib/1.0}get-type'] + + # add all class methods + for node in cls.findall(XMLNS + 'method'): +@@ -68,6 +65,10 @@ class LdVersionScript: + if not version_lowest or version_tmp < version_lowest: + version_lowest = version_tmp + ++ if '{http://www.gtk.org/introspection/glib/1.0}get-type' not in cls.attrib: ++ return ++ type_name = cls.attrib['{http://www.gtk.org/introspection/glib/1.0}get-type'] ++ + # finally add the get_type symbol + if version_lowest: + self.releases[version_lowest].append(type_name) +--- a/gusb/libgusb.ver ++++ b/gusb/libgusb.ver +@@ -40,6 +40,7 @@ LIBGUSB_0.1.0 { + g_usb_device_reset; + g_usb_device_set_configuration; + g_usb_source_error_quark; ++ g_usb_source_set_callback; + g_usb_strerror; + # LIBGUSB_0.2.5 + g_usb_context_get_main_context; diff -Nru libgusb-0.3.4/debian/patches/revert-versioning.patch libgusb-0.3.4/debian/patches/revert-versioning.patch --- libgusb-0.3.4/debian/patches/revert-versioning.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgusb-0.3.4/debian/patches/revert-versioning.patch 2020-03-17 22:58:47.000000000 +0000 @@ -0,0 +1,84 @@ +Subject: Revert versioning changes +From: Michal Čihař + +Upstream commit +https://github.com/hughsie/libgusb/commit/cfaab3e523c11800b6d77c1d10ce0c71799a4482 +has changed versions for symbols which were already made public in previous +release. This patch reverts it so that the ABI doesn't change between 0.2.9 and 0.2.10. + +This patch should be temporary until resolved upstream: +https://github.com/hughsie/libgusb/issues/9 +--- a/gusb/libgusb.ver ++++ b/gusb/libgusb.ver +@@ -41,6 +41,26 @@ LIBGUSB_0.1.0 { + g_usb_device_set_configuration; + g_usb_source_error_quark; + g_usb_strerror; ++# LIBGUSB_0.2.5 ++ g_usb_context_get_main_context; ++ g_usb_context_set_main_context; ++# LIBGUSB_0.2.8 ++ g_usb_device_get_interface; ++ g_usb_device_get_interfaces; ++ g_usb_device_get_release; ++ g_usb_device_set_interface_alt; ++ g_usb_interface_get_alternate; ++ g_usb_interface_get_class; ++ g_usb_interface_get_extra; ++ g_usb_interface_get_index; ++ g_usb_interface_get_kind; ++ g_usb_interface_get_length; ++ g_usb_interface_get_number; ++ g_usb_interface_get_protocol; ++ g_usb_interface_get_subclass; ++ g_usb_interface_get_type; ++# LIBGUSB_0.2.9 ++ g_usb_context_wait_for_replug; + local: *; + }; + +@@ -80,43 +100,16 @@ LIBGUSB_0.2.4 { + + LIBGUSB_0.2.5 { + global: +- g_usb_context_get_main_context; +- g_usb_context_set_main_context; + g_usb_device_get_custom_index; + local: *; + } LIBGUSB_0.2.4; + +-LIBGUSB_0.2.8 { +- global: +- g_usb_device_get_interface; +- g_usb_device_get_interfaces; +- g_usb_device_get_release; +- g_usb_device_set_interface_alt; +- g_usb_interface_get_alternate; +- g_usb_interface_get_class; +- g_usb_interface_get_extra; +- g_usb_interface_get_index; +- g_usb_interface_get_kind; +- g_usb_interface_get_length; +- g_usb_interface_get_number; +- g_usb_interface_get_protocol; +- g_usb_interface_get_subclass; +- g_usb_interface_get_type; +- local: *; +-} LIBGUSB_0.2.5; +- +-LIBGUSB_0.2.9 { +- global: +- g_usb_context_wait_for_replug; +- local: *; +-} LIBGUSB_0.2.8; +- + LIBGUSB_0.2.11 { + global: + g_usb_context_get_flags; + g_usb_context_set_flags; + local: *; +-} LIBGUSB_0.2.9; ++} LIBGUSB_0.2.5; + + LIBGUSB_0.3.1 { + global: diff -Nru libgusb-0.3.4/debian/patches/series libgusb-0.3.4/debian/patches/series --- libgusb-0.3.4/debian/patches/series 2020-03-09 10:24:36.000000000 +0000 +++ libgusb-0.3.4/debian/patches/series 2020-03-17 22:58:47.000000000 +0000 @@ -0,0 +1,2 @@ +revert-versioning.patch +generate-version-script-Don-t-skip-methods-on-plain-struc.patch