From ffe083f8a795721d0f38c4f977c10923de013507 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Mon, 25 Apr 2022 22:03:04 +0800 Subject: [PATCH] Import Debian changes 0.3.4-ok1 libgusb (0.3.4-ok1) yangtze; urgency=medium * Build for openKylin. --- debian/changelog | 5 + debian/compat | 1 + debian/control | 74 ++++++++++++++ debian/copyright | 50 ++++++++++ debian/docs | 1 + debian/gbp.conf | 5 + debian/gir1.2-gusb-1.0.install | 1 + debian/libgusb-dev.dirs | 2 + debian/libgusb-dev.install | 6 ++ debian/libgusb-doc.install | 1 + debian/libgusb2.dirs | 1 + debian/libgusb2.install | 1 + debian/libgusb2.symbols | 98 +++++++++++++++++++ ...pt-Don-t-skip-methods-on-plain-struc.patch | 47 +++++++++ debian/patches/revert-versioning.patch | 84 ++++++++++++++++ debian/patches/series | 2 + debian/rules | 27 +++++ debian/source/format | 1 + debian/watch | 2 + 19 files changed, 409 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/gbp.conf create mode 100644 debian/gir1.2-gusb-1.0.install create mode 100644 debian/libgusb-dev.dirs create mode 100644 debian/libgusb-dev.install create mode 100644 debian/libgusb-doc.install create mode 100644 debian/libgusb2.dirs create mode 100644 debian/libgusb2.install create mode 100644 debian/libgusb2.symbols create mode 100644 debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch create mode 100644 debian/patches/revert-versioning.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3fd3cf5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +libgusb (0.3.4-ok1) yangtze; urgency=medium + + * Build for openKylin. + + -- openKylinBot Mon, 25 Apr 2022 22:03:04 +0800 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..2720fdd --- /dev/null +++ b/debian/control @@ -0,0 +1,74 @@ +Source: libgusb +Maintainer: Michal Čihař +Section: libs +Priority: optional +Build-Depends: debhelper (>= 11), + libglib2.0-dev (>= 2.44.0), + libusb-1.0-0-dev, + gobject-introspection, + libgirepository1.0-dev, + gtk-doc-tools, + valac (>= 0.20), + meson (>= 0.46) +Build-Depends-Indep: libglib2.0-doc +Standards-Version: 4.5.0 +Homepage: http://www.hughski.com/downloads.html +Vcs-Git: https://salsa.debian.org/debian/libgusb.git +Vcs-Browser: https://salsa.debian.org/debian/libgusb + +Package: libgusb-dev +Architecture: any +Section: libdevel +Depends: libgusb2 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + gir1.2-gusb-1.0 (= ${binary:Version}), + libglib2.0-dev (>= 2.44.0), + libusb-1.0-0-dev +Description: GLib wrapper around libusb1 - development files + GUsb is a GObject wrapper for libusb1 that makes it easy to do + asynchronous control, bulk and interrupt transfers with proper + cancellation and integration into a mainloop. + . + This package contains header files needed for compiling programs with + GUsb and the gusbcmd debugging utility. + +Package: libgusb-doc +Architecture: all +Section: doc +Depends: libgusb-dev, + ${misc:Depends} +Suggests: devhelp +Build-Profiles: +Description: GLib wrapper around libusb1 - documentation + GUsb is a GObject wrapper for libusb1 that makes it easy to do + asynchronous control, bulk and interrupt transfers with proper + cancellation and integration into a mainloop. + . + This package contains the documentation. + +Package: libgusb2 +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: usb.ids +Pre-Depends: ${misc:Pre-Depends} +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 + cancellation and integration into a mainloop. + . + This package contains the GUsb shared library. + +Package: gir1.2-gusb-1.0 +Architecture: any +Section: introspection +Multi-Arch: same +Depends: ${misc:Depends}, + ${gir:Depends} +Description: GObject introspection data for libgusb + This package contains the introspection data for GUsb. + . + It can be used by packages using the GIRepository format to generate + dynamic bindings. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..eb2c387 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,50 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libgusb +Source: http://people.freedesktop.org/~hughsient/releases/ + +Files: * +Copyright: Copyright (C) 2011 Richard Hughes + Copyright (C) 2011 Hans de Goede +License: LGPL-2.1+ + +Files: tools/* +Copyright: Copyright (C) 2011 Richard Hughes +License: GPL-2.0+ + +Files: debian/* +Copyright: 2012 Michal Čihař +License: LGPL-2.1+ + +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: LGPL-2.1+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2.1". diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..41f4f8c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +sign-tags = True +pristine-tar = True diff --git a/debian/gir1.2-gusb-1.0.install b/debian/gir1.2-gusb-1.0.install new file mode 100644 index 0000000..49d71c9 --- /dev/null +++ b/debian/gir1.2-gusb-1.0.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0 diff --git a/debian/libgusb-dev.dirs b/debian/libgusb-dev.dirs new file mode 100644 index 0000000..4418816 --- /dev/null +++ b/debian/libgusb-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include diff --git a/debian/libgusb-dev.install b/debian/libgusb-dev.install new file mode 100644 index 0000000..1d9af75 --- /dev/null +++ b/debian/libgusb-dev.install @@ -0,0 +1,6 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* +usr/share/gir-* +usr/share/vala/vapi +usr/bin/gusbcmd diff --git a/debian/libgusb-doc.install b/debian/libgusb-doc.install new file mode 100644 index 0000000..49bb8f7 --- /dev/null +++ b/debian/libgusb-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/gusb/* diff --git a/debian/libgusb2.dirs b/debian/libgusb2.dirs new file mode 100644 index 0000000..6845771 --- /dev/null +++ b/debian/libgusb2.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/debian/libgusb2.install b/debian/libgusb2.install new file mode 100644 index 0000000..3ddde58 --- /dev/null +++ b/debian/libgusb2.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/debian/libgusb2.symbols b/debian/libgusb2.symbols new file mode 100644 index 0000000..5ed6d86 --- /dev/null +++ b/debian/libgusb2.symbols @@ -0,0 +1,98 @@ +libgusb.so.2 libgusb2 #MINVER# +* Build-Depends-Package: libgusb-dev + LIBGUSB_0.1.0@LIBGUSB_0.1.0 0.1.0 + LIBGUSB_0.1.1@LIBGUSB_0.1.1 0.1.1 + LIBGUSB_0.1.7@LIBGUSB_0.1.7 0.1.7 + LIBGUSB_0.2.11@LIBGUSB_0.2.11 0.2.11 + 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.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 + g_usb_context_error_quark@LIBGUSB_0.1.0 0.1.0 + g_usb_context_find_by_bus_address@LIBGUSB_0.2.2 0.2.2 + g_usb_context_find_by_platform_id@LIBGUSB_0.2.4 0.2.4 + 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.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.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 + g_usb_device_claim_interface@LIBGUSB_0.1.0 0.1.0 + g_usb_device_close@LIBGUSB_0.1.0 0.1.0 + g_usb_device_control_transfer@LIBGUSB_0.1.0 0.1.0 + g_usb_device_control_transfer_async@LIBGUSB_0.1.0 0.1.0 + g_usb_device_control_transfer_finish@LIBGUSB_0.1.0 0.1.0 + g_usb_device_error_quark@LIBGUSB_0.1.0 0.1.0 + g_usb_device_get_address@LIBGUSB_0.1.0 0.1.0 + g_usb_device_get_bus@LIBGUSB_0.1.0 0.1.0 + g_usb_device_get_children@LIBGUSB_0.2.4 0.2.4 + g_usb_device_get_configuration@LIBGUSB_0.1.0 0.1.0 + g_usb_device_get_custom_index@LIBGUSB_0.2.5 0.2.5 + 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.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 + g_usb_device_get_pid_as_str@LIBGUSB_0.2.4 0.2.4 + 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.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 + g_usb_device_get_type@LIBGUSB_0.1.0 0.1.0 + g_usb_device_get_vid@LIBGUSB_0.1.0 0.1.0 + g_usb_device_get_vid_as_str@LIBGUSB_0.2.4 0.2.4 + g_usb_device_interrupt_transfer@LIBGUSB_0.1.0 0.1.0 + g_usb_device_interrupt_transfer_async@LIBGUSB_0.1.0 0.1.0 + g_usb_device_interrupt_transfer_finish@LIBGUSB_0.1.0 0.1.0 + g_usb_device_list_coldplug@LIBGUSB_0.1.0 0.1.0 + g_usb_device_list_find_by_bus_address@LIBGUSB_0.1.0 0.1.0 + g_usb_device_list_find_by_vid_pid@LIBGUSB_0.1.0 0.1.0 + g_usb_device_list_get_devices@LIBGUSB_0.1.0 0.1.0 + g_usb_device_list_get_type@LIBGUSB_0.1.0 0.1.0 + g_usb_device_list_new@LIBGUSB_0.1.0 0.1.0 + g_usb_device_open@LIBGUSB_0.1.0 0.1.0 + 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.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 + g_usb_endpoint_get_kind@LIBGUSB_0.3.3 0.3.3 + g_usb_endpoint_get_maximum_packet_size@LIBGUSB_0.3.3 0.3.3 + g_usb_endpoint_get_number@LIBGUSB_0.3.3 0.3.3 + g_usb_endpoint_get_polling_interval@LIBGUSB_0.3.3 0.3.3 + 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.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.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 --git a/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch b/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch new file mode 100644 index 0000000..fa957fa --- /dev/null +++ b/debian/patches/generate-version-script-Don-t-skip-methods-on-plain-struc.patch @@ -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 --git a/debian/patches/revert-versioning.patch b/debian/patches/revert-versioning.patch new file mode 100644 index 0000000..a7c1f5f --- /dev/null +++ b/debian/patches/revert-versioning.patch @@ -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 --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c86502f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +revert-versioning.patch +generate-version-script-Don-t-skip-methods-on-plain-struc.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..c19c6dd --- /dev/null +++ b/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +override_dh_missing: + dh_missing --fail-missing + +override_dh_installchangelogs: + dh_installchangelogs NEWS + +override_dh_auto_test: + # dh_auto_test + echo "Skipping tests as they fail in build environment due to USB bus not available" + +override_dh_auto_configure: + dh_auto_configure -- -Dusb_ids=/usr/share/misc/usb.ids + +%: + dh $@ --with gir + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..02b19f8 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://people.freedesktop.org/~hughsient/releases/ libgusb-(.*)\.tar\.xz