diff -Nru brltty-6.4/debian/brltty.lintian-overrides brltty-6.4/debian/brltty.lintian-overrides --- brltty-6.4/debian/brltty.lintian-overrides 2021-11-16 16:25:42.000000000 +0000 +++ brltty-6.4/debian/brltty.lintian-overrides 2022-03-18 14:26:01.000000000 +0000 @@ -1,4 +1,4 @@ # We do have a recommends python3-script-but-no-python3-dep etc/brltty/Contraction/latex-access.ctb /usr/bin/python3 -non-standard-dir-perm var/lib/BrlAPI/ 1777 != 0755 +non-standard-dir-perm 1777 != 0755 [[]var/lib/BrlAPI/] diff -Nru brltty-6.4/debian/changelog brltty-6.4/debian/changelog --- brltty-6.4/debian/changelog 2022-02-09 04:39:06.000000000 +0000 +++ brltty-6.4/debian/changelog 2022-03-18 16:59:59.000000000 +0000 @@ -1,3 +1,43 @@ +brltty (6.4-4ubuntu2) jammy; urgency=medium + + * Support python3.10's change to the default sysconfig scheme, fixing FTBFS + with Python 3.10 by default. (Closes: Bug#1007927) + + -- Stefano Rivera Fri, 18 Mar 2022 12:59:59 -0400 + +brltty (6.4-4ubuntu1) jammy; urgency=medium + + * Resynchornize on Debian, fix the build + + -- Sebastien Bacher Fri, 18 Mar 2022 15:26:01 +0100 + +brltty (6.4-4) unstable; urgency=medium + + [ Camaleón ] + * po/es.po: Spanish translation (Closes: Bug#1003516) + + -- Samuel Thibault Sat, 29 Jan 2022 14:21:00 +0100 + +brltty (6.4-3) unstable; urgency=medium + + [ Américo Monteiro ] + * po/pt.po: Portuguese translation (Closes: Bug#1001919) + + [ Samuel Thibault ] + * rules: Remove etc/brltty/Contraction/latex-access.ctb from brltty-udeb. + * control: Remove libpcre3-dev build-dep, not actually used + (Closes: Bug#1000046) + * rules: Remove --without-viavoice, dropped in 6.0 release. + * control: Bump Standards-Version to 4.6.0 (no change) + + -- Samuel Thibault Sat, 08 Jan 2022 20:13:40 +0100 + +brltty (6.4-2ubuntu3) jammy; urgency=medium + + * No-change rebuild with Python 3.10 only + + -- Graham Inggs Wed, 16 Mar 2022 22:34:27 +0000 + brltty (6.4-2ubuntu2) jammy; urgency=medium * No-change rebuild for icu soname change. diff -Nru brltty-6.4/debian/control brltty-6.4/debian/control --- brltty-6.4/debian/control 2021-11-17 09:55:25.000000000 +0000 +++ brltty-6.4/debian/control 2022-03-18 14:26:01.000000000 +0000 @@ -12,7 +12,7 @@ libasound2-dev [linux-any], python3-all-dev:any, cython3 (>= 0.28.4), - libexpat1-dev, libpcre3-dev, + libexpat1-dev, libgpm-dev [linux-any], libsystemd-dev [linux-any], libicu-dev, liblouis-dev, libpolkit-gobject-1-dev, libcap-dev [linux-any], @@ -29,7 +29,7 @@ Build-Conflicts: libatspi-dev, libasound2-dev [!linux-any] Rules-Requires-Root: no -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Package: brltty Architecture: any diff -Nru brltty-6.4/debian/gbp.conf brltty-6.4/debian/gbp.conf --- brltty-6.4/debian/gbp.conf 2021-11-16 16:25:42.000000000 +0000 +++ brltty-6.4/debian/gbp.conf 2022-03-18 14:26:01.000000000 +0000 @@ -4,7 +4,9 @@ [import-orig] symlink-orig = False -filter = [ 'Documents/BrlAPIref/html', +filter = [ 'doc/BrlAPIref', + 'doc/Manual-BrlAPI/English/*.html', + 'Documents/BrlAPIref/html', 'DOS/*.exe', 'Windows/*.dll', 'Android/Gradle/gradle/wrapper/*.jar' ] diff -Nru brltty-6.4/debian/libbrlapi-dev.lintian-overrides brltty-6.4/debian/libbrlapi-dev.lintian-overrides --- brltty-6.4/debian/libbrlapi-dev.lintian-overrides 2021-11-16 16:25:42.000000000 +0000 +++ brltty-6.4/debian/libbrlapi-dev.lintian-overrides 2022-03-18 14:26:01.000000000 +0000 @@ -1,2 +1,2 @@ # These are generated by doxygen, see https://github.com/doxygen/doxygen/issues/2625 -bad-whatis-entry usr/share/man/man3/brlapi_* +bad-whatis-entry [[]usr/share/man/man3/brlapi_*] diff -Nru brltty-6.4/debian/patches/py310-sysconfig brltty-6.4/debian/patches/py310-sysconfig --- brltty-6.4/debian/patches/py310-sysconfig 1970-01-01 00:00:00.000000000 +0000 +++ brltty-6.4/debian/patches/py310-sysconfig 2022-03-18 16:59:51.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Handle Debian's default posix_prefix sysconfig layout + Debian adds a custom sysconfig scheme to system python installs, + "posix_local". This is the default scheme, and it redirects local users' + Python module installs to /usr/local even though Python is installed with a + /usr prefix. Both are on Debian's python's sys.path module search path. + . + Previously this custom sysconfig scheme was specified in distutils.sysconfig, + but not sysconfig itself. As distutils is being deprecated, the custom scheme + is now specified in sysconfig, since Debian's Python 3.10 (3.10.2-4). + . + As far as I can see, pythoncmd is only used in detecting the installed system + python, not determining where the built module will be installed, so this + patch is sufficient. To control where the module is installed, the approach + would be to pass the selected prefix to sysconfig, when querying the install + path. +Bug-Debian: https://bugs.debian.org/1007927 +Forwarded: https://github.com/brltty/brltty/pull/362 + +--- a/Tools/pythoncmd ++++ b/Tools/pythoncmd +@@ -46,15 +46,22 @@ + try: + import sysconfig + # putProgramMessage("sysconfig") ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() ++ if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' + + def getIncludeDirectory(): +- return sysconfig.get_path("include") ++ return sysconfig.get_path("include", scheme) + + def getLibraryDirectory(): +- return sysconfig.get_path("stdlib") ++ return sysconfig.get_path("stdlib", scheme) + + def getPackageDirectory(): +- return sysconfig.get_path("platlib") ++ return sysconfig.get_path("platlib", scheme) + + def getConfigurationVariable(name): + return sysconfig.get_config_var(name) diff -Nru brltty-6.4/debian/patches/series brltty-6.4/debian/patches/series --- brltty-6.4/debian/patches/series 2021-11-16 16:25:42.000000000 +0000 +++ brltty-6.4/debian/patches/series 2022-03-18 16:59:56.000000000 +0000 @@ -3,3 +3,4 @@ 41-java-bytecode-compat.patch disable-synth-callback.patch socket-permissions +py310-sysconfig diff -Nru brltty-6.4/debian/po/es.po brltty-6.4/debian/po/es.po --- brltty-6.4/debian/po/es.po 1970-01-01 00:00:00.000000000 +0000 +++ brltty-6.4/debian/po/es.po 2022-03-18 14:26:01.000000000 +0000 @@ -0,0 +1,26 @@ +# brltty po-debconf translation to Spanish. +# Copyright (C) 2022 +# This file is distributed under the same license as the brltty package. +# Camaleón , 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: brltty\n" +"Report-Msgid-Bugs-To: brltty@packages.debian.org\n" +"POT-Creation-Date: 2021-08-15 23:13+0200\n" +"PO-Revision-Date: 2022-01-06 20:16+0100\n" +"Last-Translator: Camaleón \n" +"Language-Team: Debian Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#. MUST be kept below 55 characters/columns +#. :sl1: +#: ../brltty-udeb.templates:1001 +msgid "Access the installer using a Braille display" +msgstr "Acceder al instalador utilizando una línea Braille" diff -Nru brltty-6.4/debian/po/pt.po brltty-6.4/debian/po/pt.po --- brltty-6.4/debian/po/pt.po 1970-01-01 00:00:00.000000000 +0000 +++ brltty-6.4/debian/po/pt.po 2022-03-18 14:26:01.000000000 +0000 @@ -0,0 +1,28 @@ +# Translation of brltty debconf messages to European Portuguese +# Copyright (C) YEAR THE brltty'S COPYRIGHT HOLDER +# This file is distributed under the same license as the brltty package. +# +# Américo Monteiro , 2021. +msgid "" +msgstr "" +"Project-Id-Version: brltty 6.4-2\n" +"Report-Msgid-Bugs-To: brltty@packages.debian.org\n" +"POT-Creation-Date: 2021-08-15 23:13+0200\n" +"PO-Revision-Date: 2021-12-18 22:13+0000\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese <>\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 20.12.0\n" + +#. Type: text +#. Description +#. Main menu item +#. MUST be kept below 55 characters/columns +#. :sl1: +#: ../brltty-udeb.templates:1001 +msgid "Access the installer using a Braille display" +msgstr "Aceder ao instalador usando um mostrador de Braille" diff -Nru brltty-6.4/debian/rules brltty-6.4/debian/rules --- brltty-6.4/debian/rules 2021-11-17 09:58:53.000000000 +0000 +++ brltty-6.4/debian/rules 2022-03-18 14:26:01.000000000 +0000 @@ -23,7 +23,7 @@ HARDENING = CPPFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CPPFLAGS)" CFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)" CXXFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CXXFLAGS)" LDFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)" CONFIGURE_OPTIONS = --mandir=/usr/share/man \ - --without-viavoice --without-theta --without-swift \ + --without-theta --without-swift \ JAVA_JNI_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/jni DEB_CONFIGURE_OPTIONS = --with-curses=ncursesw --disable-stripping @@ -254,6 +254,7 @@ sed -e 's/ *#.*//' -e 's/[ ]\+/ /g' $$file | sed -n '/./p' > $$file.tmp && \ mv $$file.tmp $$file; \ done + rm debian/brltty-udeb/etc/brltty/Contraction/latex-access.ctb # It is sad, but help files are not really essential, but they are # fairly large. rm debian/brltty-udeb/etc/brltty/Input/*/*.txt diff -Nru brltty-6.4/debian/salsa-ci.yml brltty-6.4/debian/salsa-ci.yml --- brltty-6.4/debian/salsa-ci.yml 2021-11-16 16:25:42.000000000 +0000 +++ brltty-6.4/debian/salsa-ci.yml 2022-03-18 14:26:01.000000000 +0000 @@ -8,4 +8,8 @@ # as well as #988999 SALSA_CI_DISABLE_REPROTEST: 1 +# needs cross-clisp and cross-cython +#test-crossbuild-arm64: +# allow_failure: false + # vim: ts=2 sw=2 et sts=2 ft=yaml