diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/changelog solaar-1.1.6/debian/changelog --- solaar-1.1.6~ubuntu22.10.1/debian/changelog 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/changelog 2022-10-26 13:05:38.000000000 +0000 @@ -1,8 +1,8 @@ -solaar (1.1.6~ubuntu22.10.1) kinetic; urgency=low +solaar (1.1.6-202210261305~ubuntu22.10.1) kinetic; urgency=low * Auto build. - -- gogo Wed, 26 Oct 2022 12:57:39 +0000 + -- gogo Wed, 26 Oct 2022 13:05:38 +0000 solaar (1.1.2+dfsg-1) unstable; urgency=emergency diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/git-build-recipe.manifest solaar-1.1.6/debian/git-build-recipe.manifest --- solaar-1.1.6~ubuntu22.10.1/debian/git-build-recipe.manifest 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/git-build-recipe.manifest 2022-10-26 13:05:38.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 1.1.6 -lp:~solaar-unifying/solaar-unifying git-commit:b2bcc387bb0494eec281ac4b939fbb5ef8a1270c +# git-build-recipe format 0.4 deb-version 1.1.6-202210261305 +lp:~solaar-unifying/solaar-unifying git-commit:8d0795af531869ff0a2cb64841dbeeb0e5b236fe nest-part packaging lp:solaar-unifying packaging/debian debian git-commit:11a39051a643222746cedadc95b1c9ff7b4da4fd diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/cs.po solaar-1.1.6/debian/po/cs.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/cs.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/cs.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar 0.9.2+dfsg-4\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-24 09:15+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/da.po solaar-1.1.6/debian/po/da.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/da.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/da.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-12 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/de.po solaar-1.1.6/debian/po/de.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/de.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/de.po 2022-10-26 13:05:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: solaar 0.9.2+dfsg-4\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-10 18:22+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/en.po solaar-1.1.6/debian/po/en.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/en.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/en.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2013-06-17 16:01+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/es.po solaar-1.1.6/debian/po/es.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/es.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/es.po 2022-10-26 13:05:38.000000000 +0000 @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-12-05 16:49+0100\n" "Last-Translator: Camaleón \n" "Language-Team: Debian Spanish \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/fr.po solaar-1.1.6/debian/po/fr.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/fr.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/fr.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-12 10:09+0200\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/hr.po solaar-1.1.6/debian/po/hr.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/hr.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/hr.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2020-03-16 12:17+0100\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/it.po solaar-1.1.6/debian/po/it.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/it.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/it.po 2022-10-26 13:05:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-12 14:42+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/nl.po solaar-1.1.6/debian/po/nl.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/nl.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/nl.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-20 20:51+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/pt_BR.po solaar-1.1.6/debian/po/pt_BR.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/pt_BR.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/pt_BR.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-10 17:45-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Portuguese \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/ru.po solaar-1.1.6/debian/po/ru.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/ru.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/ru.po 2022-10-26 13:05:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: solaar 0.9.2+dfsg-4\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2014-10-11 09:25+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/sv.po solaar-1.1.6/debian/po/sv.po --- solaar-1.1.6~ubuntu22.10.1/debian/po/sv.po 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/sv.po 2022-10-26 13:05:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: 2017-09-23 22:46+0200\n" "Last-Translator: Jonatan Nyberg \n" "Language-Team: \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/debian/po/templates.pot solaar-1.1.6/debian/po/templates.pot --- solaar-1.1.6~ubuntu22.10.1/debian/po/templates.pot 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/debian/po/templates.pot 2022-10-26 13:05:38.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: solaar\n" "Report-Msgid-Bugs-To: solaar@packages.debian.org\n" -"POT-Creation-Date: 2022-10-26 12:57+0000\n" +"POT-Creation-Date: 2022-10-26 13:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru solaar-1.1.6~ubuntu22.10.1/docs/installation.md solaar-1.1.6/docs/installation.md --- solaar-1.1.6~ubuntu22.10.1/docs/installation.md 2022-10-26 12:57:29.000000000 +0000 +++ solaar-1.1.6/docs/installation.md 2022-10-26 13:04:33.000000000 +0000 @@ -7,8 +7,7 @@ ## Downloading -Clone Solaar from GitHub by `git clone --recurse-submodules https://github.com/pwr-Solaar/Solaar.git`. -Make sure that the submodule python-hid-parser was cloned, i.e., the directory `python-hid-parser` has content. +Clone Solaar from GitHub by `git clone https://github.com/pwr-Solaar/Solaar.git`. ## Requirements for Solaar @@ -33,6 +32,11 @@ You may have to install `gcc` and the Python development package (`python3-dev` or `python3-devel`, depending on your distribution). +If the `hid_parser` Python package is available, Solaar parses HID report descriptors +and can control more HID++ devices that do not use a receiver. +This package may not be available in some distributions but can be installed using pip +via `pip install --user hid-parser`. + If you are running a version of Python different from the system version, you may need to use pip to install projects that provide the above Python packages. diff -Nru solaar-1.1.6~ubuntu22.10.1/lib/hidapi/udev.py solaar-1.1.6/lib/hidapi/udev.py --- solaar-1.1.6~ubuntu22.10.1/lib/hidapi/udev.py 2022-10-26 12:57:29.000000000 +0000 +++ solaar-1.1.6/lib/hidapi/udev.py 2022-10-26 13:04:33.000000000 +0000 @@ -36,8 +36,6 @@ from time import sleep from time import time as _timestamp -from hid_parser import ReportDescriptor as _ReportDescriptor -from hid_parser import Usage as _Usage from pyudev import Context as _Context from pyudev import Device as _Device from pyudev import DeviceNotFoundError @@ -103,8 +101,13 @@ if not hid_id: return # there are reports that sometimes the id isn't set up right so be defensive bid, vid, pid = hid_id.split(':') + hid_hid_device = hid_device.find_parent('hid') + if hid_hid_device: + return # these are devices connected through a receiver so don't pick them up here try: # if report descriptor does not indicate HID++ capabilities then this device is not of interest to Solaar + from hid_parser import ReportDescriptor as _ReportDescriptor + from hid_parser import Usage as _Usage hidpp_short = hidpp_long = False devfile = '/sys' + hid_device.get('DEVPATH') + '/report_descriptor' with fileopen(devfile, 'rb') as fd: @@ -122,9 +125,6 @@ except Exception as e: # if can't process report descriptor fall back to old scheme hidpp_short = hidpp_long = None _log.warn('Report Descriptor not processed for BID %s VID %s PID %s: %s', bid, vid, pid, e) - hid_hid_device = hid_device.find_parent('hid') - if hid_hid_device: - return # these are devices connected through a receiver so don't pick them up here filter = filterfn(int(bid, 16), int(vid, 16), int(pid, 16), hidpp_short, hidpp_long) if not filter: diff -Nru solaar-1.1.6~ubuntu22.10.1/.pc/.quilt_patches solaar-1.1.6/.pc/.quilt_patches --- solaar-1.1.6~ubuntu22.10.1/.pc/.quilt_patches 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/.pc/.quilt_patches 2022-10-26 13:05:38.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3440241/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-3440261/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru solaar-1.1.6~ubuntu22.10.1/.pc/.quilt_series solaar-1.1.6/.pc/.quilt_series --- solaar-1.1.6~ubuntu22.10.1/.pc/.quilt_series 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/.pc/.quilt_series 2022-10-26 13:05:38.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3440241/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-3440261/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series diff -Nru solaar-1.1.6~ubuntu22.10.1/.pc/skip-udev-rule-installation.patch/setup.py solaar-1.1.6/.pc/skip-udev-rule-installation.patch/setup.py --- solaar-1.1.6~ubuntu22.10.1/.pc/skip-udev-rule-installation.patch/setup.py 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/.pc/skip-udev-rule-installation.patch/setup.py 2022-10-26 13:05:38.000000000 +0000 @@ -67,8 +67,12 @@ 'python-xlib (>= 0.27)', 'psutil (>= 5.4.3)', ], + extras_require={ + 'report-descriptor': ['hid-parser'], + 'desktop-notifications': ['Notify (>= 0.7)'], + }, package_dir={'': 'lib'}, - packages=['keysyms', 'hidapi', 'hid_parser', 'logitech_receiver', 'solaar', 'solaar.ui', 'solaar.cli'], + packages=['keysyms', 'hidapi', 'logitech_receiver', 'solaar', 'solaar.ui', 'solaar.cli'], data_files=list(_data_files()), scripts=_glob('bin/*'), ) diff -Nru solaar-1.1.6~ubuntu22.10.1/setup.py solaar-1.1.6/setup.py --- solaar-1.1.6~ubuntu22.10.1/setup.py 2022-10-26 12:57:39.000000000 +0000 +++ solaar-1.1.6/setup.py 2022-10-26 13:05:38.000000000 +0000 @@ -66,8 +66,12 @@ 'python-xlib (>= 0.27)', 'psutil (>= 5.4.3)', ], + extras_require={ + 'report-descriptor': ['hid-parser'], + 'desktop-notifications': ['Notify (>= 0.7)'], + }, package_dir={'': 'lib'}, - packages=['keysyms', 'hidapi', 'hid_parser', 'logitech_receiver', 'solaar', 'solaar.ui', 'solaar.cli'], + packages=['keysyms', 'hidapi', 'logitech_receiver', 'solaar', 'solaar.ui', 'solaar.cli'], data_files=list(_data_files()), scripts=_glob('bin/*'), )