Merge ~aleasto/ubuntu/+source/brltty:merge-6.7-1 into ubuntu/+source/brltty:debian/sid

[Alessandro Astone]

This merges debian/6.7-1 from debian unstable into ubuntu

[Sebastien Bacher (seb128)]

Thanks. I'm uploading the merge now but don't have the right to change the status

review: Approve

diff --git a/debian/brltty-setup b/debian/brltty-setup
new file mode 100644
index 0000000..865a168
--- /dev/null
+++ b/debian/brltty-setup
@@ -0,0 +1,60 @@
+#! /bin/sh
+set -e
+
+# Exits zero if a device was configured, otherwise non-zero.
+
+cat <<EOF
+=== BRAILLE CONFIGURATION ===
+
+Please specify the type of braille device you wish to configure.
+See http://access.ubuntu.com/braille for details.
+Note that USB devices not connected via a USB serial converter will be
+detected automatically, so if you have one of these you can press X.
+
+B - Bluetooth
+S - Serial
+U - USB serial
+X - Exit
+EOF
+printf "Device type (b/s/u/x): "
+read device_type
+echo
+
+case "$device_type" in
+	[bB]) 
+		echo "== Bluetooth device configuration =="
+		echo 
+		printf "Bluetooth device address: "
+		read b_address
+		echo 
+		echo "Configuring bluetooth braille device on address" \
+			"$b_address" 
+		/lib/brltty/brltty.sh -b auto -d "bluetooth:$b_address"
+		;;
+	[sS]) 
+		echo "== Serial device configuration =="
+		echo
+		printf "Serial port (0-9 for ttyS0-9): "
+		read s_port
+		printf "Device type (brltty model code): "
+		read s_model	echo 
+		echo "Configuring serial braille device on ttyS$s_port" 
+		/lib/brltty/brltty.sh -b "$s_model" -d "serial:ttyS$s_port"
+		;;
+	[uU]) 
+		echo "== USB serial device configuration =="
+		echo
+		printf "USB serial port: "
+		read u_port
+		printf "Device type (brltty model code): "
+		read u_model	
+		echo 
+		echo "Configuring serial braille device on ttyUSB$u_port" 
+		/lib/brltty/brltty.sh -b "$u_model" -d "serial:ttyUSB$u_port"
+		;;
+	*)
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/debian/brltty-udev.service b/debian/brltty-udev.service
new file mode 100644
index 0000000..3f9b3a9
--- /dev/null
+++ b/debian/brltty-udev.service
@@ -0,0 +1,29 @@
+[Unit]
+
+Description=Braille Device Support
+Documentation=man:brltty(1)
+Documentation=http://brltty.com/
+
+DefaultDependencies=no
+StopWhenUnneeded=true
+
+RequiresMountsFor=/var/lib/brltty
+
+
+[Service]
+
+Type=notify
+ExecStart=/sbin/brltty -n -p /run/brltty.pid
+
+TimeoutStartSec=5
+TimeoutStopSec=10
+
+Restart=always
+RestartSec=30
+
+Nice=-10
+OOMScoreAdjust=-900
+
+ProtectHome=read-only
+ProtectSystem=full
+SystemCallArchitectures=native
diff --git a/debian/brltty.dirs b/debian/brltty.dirs
index a10523d..b5003fa 100644
--- a/debian/brltty.dirs
+++ b/debian/brltty.dirs
@@ -1,4 +1,5 @@
 etc/brltty
 lib/brltty
+lib/udev/rules.d
 usr/share/initramfs-tools/hooks
 usr/share/initramfs-tools/scripts/init-premount
diff --git a/debian/brltty.install b/debian/brltty.install
index 83e5fc2..8ef2121 100644
--- a/debian/brltty.install
+++ b/debian/brltty.install
@@ -18,4 +18,7 @@ debian/initramfs/hooks/brltty usr/share/initramfs-tools/hooks
 debian/initramfs/scripts/init-premount/brltty usr/share/initramfs-tools/scripts/init-premount
 debian/tmp/usr/share/polkit-1
 debian/tmp/usr/share/metainfo
+debian/initramfs/scripts/init-top/brltty usr/share/initramfs-tools/scripts/init-top
+debian/initramfs/brltty.sh usr/share/brltty/initramfs
+debian/brltty-setup sbin
 debian/tmp/var/lib
diff --git a/debian/brltty.udev.rules.patch b/debian/brltty.udev.rules.patch
new file mode 100644
index 0000000..4e99aeb
--- /dev/null
+++ b/debian/brltty.udev.rules.patch
@@ -0,0 +1,102 @@
+--- debian/brltty-udeb.udev.rules	2024-11-21 17:46:31.018674515 +0100
++++ debian/brltty.udev.rules	2024-11-22 10:09:15.347543775 +0100
+@@ -20,18 +20,12 @@
+ # Udev rules for starting BRLTTY when a USB braille device is connected #
+ #########################################################################
+ 
++# compare this with BRLTTY's Autostart/Udev/rules
++
+ SUBSYSTEM=="usb_device", GOTO="brltty_usb_begin"
+ SUBSYSTEM=="usb", KERNEL!="*:*", GOTO="brltty_usb_begin"
+ GOTO="brltty_device_end"
+ 
+-# Note: This is only meant for use in the Debian Installer, since it contains
+-# the udev rules for generic USB IDs. For installed packages, make install-udev
+-# should be used instead, and customized.rules can be installed by default, but
+-# generic.rules should be installed only when one is sure that the system is
+-# supposed to be running a Braille device.
+-#
+-# Note: Compare this with BRLTTY's Autostart/Udev/usb-{customized,generic}.rules after running make there.
+-#
+ # Note about generic identifiers:
+ #
+ # on updating, check in Programs/config.c's autodetectableBrailleDrivers_* about
+@@ -54,17 +48,19 @@
+ # HandyTech [FTDI chip]
+ # Hedo [MobilLine]
+ # MDV [all models]
+-ENV{PRODUCT}=="403/6001/*", ATTR{manufacturer}=="FTDI", ENV{BRLTTY_BRAILLE_DRIVER}="hm,ht", GOTO="brltty_usb_run"
++# Ubuntu disable those to avoid conflicts, https://launchpad.net/bugs/1958224
++# ENV{PRODUCT}=="403/6001/*", ATTR{manufacturer}=="FTDI", ENV{BRLTTY_BRAILLE_DRIVER}="hd,hm,ht", GOTO="brltty_usb_run"
+ ENV{PRODUCT}=="403/6001/*", ATTR{manufacturer}=="Hedo Reha Technik GmbH", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run"
+ ENV{PRODUCT}=="403/6001/*", ATTR{manufacturer}=="Tivomatic Oy", ENV{BRLTTY_BRAILLE_DRIVER}="at", GOTO="brltty_usb_run"
+-ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="ce,md", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="ce,md", GOTO="brltty_usb_run"
+ 
+ # Device: 0403:6010
+ # Generic Identifier
+ # Vendor: Future Technology Devices International, Ltd
+ # Product: FT2232C/D/H Dual UART/FIFO IC
+ # DotPad [all models]
+-ENV{PRODUCT}=="403/6010/*", ENV{BRLTTY_BRAILLE_DRIVER}="dp", GOTO="brltty_usb_run"
++# Ubuntu disable those to avoid conflicts, https://launchpad.net/bugs/1958224
++#ENV{PRODUCT}=="403/6010/*", ENV{BRLTTY_BRAILLE_DRIVER}="dp", GOTO="brltty_usb_run"
+ 
+ # Device: 10C4:EA60
+ # Generic Identifier
+@@ -73,28 +69,31 @@
+ # BrailleMemo [Next Touch 40]
+ # BrailleMemo [Pocket]
+ # Seika [Braille Display]
+-ENV{PRODUCT}=="10c4/ea60/*", ATTR{manufacturer}=="Silicon Labs", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
++# Ubuntu disable those to avoid conflicts, https://launchpad.net/bugs/1958224
++#ENV{PRODUCT}=="10c4/ea60/*", ATTR{manufacturer}=="Silicon Labs", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 10C4:EA80
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge
+ # Seika [Note Taker]
+-ENV{PRODUCT}=="10c4/ea80/*", ATTR{manufacturer}=="Silicon Laboratories", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
++# Ubuntu disable those to avoid conflicts, https://launchpad.net/bugs/1958224
++#ENV{PRODUCT}=="10c4/ea80/*", ATTR{manufacturer}=="Silicon Laboratories", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 1A86:55D3
+ # Generic Identifier
+ # Vendor: QinHeng Electronics
+ # Product: USB Single Serial
+ # HIMS [eMotion (legacy)]
+-ENV{PRODUCT}=="1a86/55d3/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run"
++# Ubuntu disable those to avoid conflicts, https://launchpad.net/bugs/1958224
++#ENV{PRODUCT}=="1a86/55d3/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run"
+ 
+ # Device: 1A86:7523
+ # Generic Identifier
+ # Vendor: Jiangsu QinHeng, Ltd.
+ # Product: CH341 USB Bridge Controller
+ # Baum [NLS eReader Zoomax (20 cells)]
+-ENV{PRODUCT}=="1a86/7523/*", ATTRS{idVendor}=="1a40", ATTRS{idProduct}=="0101", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="1a86/7523/*", ATTRS{idVendor}=="1a40", ATTRS{idProduct}=="0101", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
+ 
+ # Device: 0403:DE58
+ # Hedo [MobilLine]
+@@ -613,17 +612,8 @@
+ 
+ LABEL="brltty_device_run"
+ ENV{BRLTTY_PID_FILE}="/var/run/brltty.pid"
+-
+-ACTION=="add", GOTO="brltty_add"
+-ACTION=="remove", GOTO="brltty_remove"
+-GOTO="brltty_device_end"
+-
+-LABEL="brltty_add"
+-RUN+="/lib/udev/brltty.sh"
+-GOTO="brltty_device_end"
+-
+-LABEL="brltty_remove"
+-RUN+="/lib/udev/brltty.sh -C"
++TAG+="systemd"
++ENV{SYSTEMD_WANTS}+="brltty-udev.service"
+ GOTO="brltty_device_end"
+ 
+ LABEL="brltty_device_end"
diff --git a/debian/changelog b/debian/changelog
index 57636f3..ec83c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+brltty (6.7-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian unstable (LP: #2089289). Remaining changes:
+    + add brltty-setup
+      - debian/brltty-setup
+      - debian/brltty.install
+      - debian/rules
+    + add initramfs integration to run brltty-setup if necessary before
+      plymouth starts
+      - debian/initramfs/brltty.sh
+      - debian/initramfs/hooks/brltty.in
+      - debian/initramfs/scripts/init-premount/brltty
+      - debian/initramfs/scripts/init-top/brltty
+      - debian/brltty.install
+      - debian/brltty.postinst
+    + add udev rules file that uses brltty-udev.service to activate via
+      systemd
+      - debian/brltty-udev.service
+      - debian/brltty.dirs
+      - debian/brltty.udev.rules.patch
+      - debian/rules
+      - debian/clean
+    + disable brltty.service by default, but enable it if the user configures
+      Braille at install time for a non-USB display
+      - debian/rules
+  * Disable generic devices 1A86:55D3 and 1A86:7523 (LP: #1958224)
+
+ -- Alessandro Astone <[e-mail]>  Fri, 22 Nov 2024 10:10:12 +0100
+
 brltty (6.7-1) unstable; urgency=medium
 
   * New upstream release.
@@ -9,6 +38,46 @@ brltty (6.7-1) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Thu, 17 Oct 2024 20:32:36 +0200
 
+brltty (6.6-5ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild to add support for Python 3.13.
+
+ -- Matthias Klose <[e-mail]>  Thu, 14 Nov 2024 19:29:23 +0100
+
+brltty (6.6-5ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    + add brltty-setup
+      - debian/brltty-setup
+      - debian/brltty.install
+      - debian/rules
+    + add initramfs integration to run brltty-setup if necessary before
+      plymouth starts
+      - debian/initramfs/brltty.sh
+      - debian/initramfs/hooks/brltty.in
+      - debian/initramfs/scripts/init-premount/brltty
+      - debian/initramfs/scripts/init-top/brltty
+      - debian/brltty.install
+      - debian/brltty.postinst
+    + add udev rules file that uses brltty-udev.service to activate via
+      systemd
+      - debian/brltty-udev.service
+      - debian/brltty.dirs
+      - debian/brltty.udev.rules.patch
+      - debian/rules
+      - debian/clean
+    + disable brltty.service by default, but enable it if the user configures
+      Braille at install time for a non-USB display
+      - debian/rules
+  * Dropped changes, no longer needed:
+    - drop ubiquity integration, as ubiquity is now obsolete.
+    - dropped versioned build-dependency on the dapper version of
+      initramfs-tools; brltty does not depend on initramfs-tools being
+      present, it merely integrates with it.
+  * Drop reference to obsolete /var/run.
+
+ -- Steve Langasek <[e-mail]>  Thu, 06 Jun 2024 19:23:50 -0700
+
 brltty (6.6-5) unstable; urgency=medium
 
   * control: Replace pkg-config deps with pkgconf.
@@ -24,6 +93,78 @@ brltty (6.6-4+exp1) experimental; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sat, 17 Feb 2024 22:42:48 +0100
 
+brltty (6.6-4ubuntu5) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 00:24:15 +0000
+
+brltty (6.6-4ubuntu4) noble; urgency=medium
+
+  * No-change rebuild against libglib2.0-0t64
+
+ -- Steve Langasek <[e-mail]>  Mon, 11 Mar 2024 22:05:38 +0000
+
+brltty (6.6-4ubuntu3) noble; urgency=medium
+
+  * No-change rebuild against libglib2.0-0t64
+
+ -- Steve Langasek <[e-mail]>  Fri, 08 Mar 2024 03:58:09 +0000
+
+brltty (6.6-4ubuntu2) noble; urgency=medium
+
+  * No-change rebuild for ICU soname change.
+
+ -- Matthias Klose <[e-mail]>  Tue, 19 Dec 2023 11:05:14 +0100
+
+brltty (6.6-4ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remaining changes:
+      + add brltty-setup
+        - debian/brltty-setup
+        - debian/brltty.install
+        - debian/rules
+      + add initramfs integration to run brltty-setup if necessary before
+        plymouth starts
+        - debian/control
+        - debian/initramfs/brltty.sh
+        - debian/initramfs/hooks/brltty.in
+        - debian/initramfs/scripts/init-premount/brltty
+        - debian/initramfs/scripts/init-top/brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+        - debian/brltty.postinst
+      + add ubiquity integration to propagate any brltty configuration to the
+        target system
+        - debian/31brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+      + add udev rules file that uses brltty-udev.service to activate via
+        systemd
+        - debian/brltty-udev.service
+        - debian/brltty.dirs
+        - debian/brltty.udev.rules
+        - debian/rules
+      + disable brltty.service by default, but enable it if the user configures
+        Braille at install time for a non-USB display
+        - debian/31brltty
+        - debian/rules
+      + don't install /etc/brltty.conf in the package
+        - debian/31brltty
+  * Include further updates to brltty.udev.rules from brltty-udeb.udev.rules
+    that were omitted in the previous release cycle due to timing.
+    - devices with FTDI and Silicon Laboratories as a manufacturer remain
+      disabled as these do not uniquely identify accessibility devices.
+  * Re-enable udev rules for devices from Hedo Reha Technik GmbH, which is
+    a maker of accessibility devices and therefore not a false positive
+  * Move debian/brltty.udev.rules to a patch debian/brltty.udev.rules.patch
+    against debian/brltty-udeb.udev.rules to be applied at build time and
+    hard fail on any inconsistencies, to avoid future issues with missing
+    updates to the Ubuntu-specific file
+
+ -- Steve Langasek <[e-mail]>  Sun, 19 Nov 2023 04:08:14 -0800
+
 brltty (6.6-4) unstable; urgency=high
 
   * patches/git-base-none-quality: Set quality to low or none for base and no
@@ -62,6 +203,65 @@ brltty (6.6-1) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sat, 05 Aug 2023 02:42:32 +0200
 
+brltty (6.5-7ubuntu3) noble; urgency=medium
+
+  * No-change rebuild to build with python3.12 as supported.
+
+ -- Matthias Klose <[e-mail]>  Thu, 02 Nov 2023 09:19:04 +0100
+
+brltty (6.5-7ubuntu2) mantic; urgency=medium
+
+  * Merge brltty.udev.rules from brltty-udeb.udev.rules.  This picks up only
+    changes to comments, enablement of new device IDs that are from
+    manufacturers that work specifically in Braille devices (HumanWare), and
+    those changes that restrict existing matches on generic device IDs to
+    reduce false-positives matches.  Additional changes should be merged for
+    testing at the start of the next release cycle.  Thanks to
+    Samuel Thibault for pointing this out (LP 1958224).
+
+ -- Steve Langasek <[e-mail]>  Sun, 01 Oct 2023 16:58:06 -0700
+
+brltty (6.5-7ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remaining changes:
+      + add brltty-setup
+        - debian/brltty-setup
+        - debian/brltty.install
+        - debian/rules
+      + add initramfs integration to run brltty-setup if necessary before
+        plymouth starts
+        - debian/control
+        - debian/initramfs/brltty.sh
+        - debian/initramfs/hooks/brltty.in
+        - debian/initramfs/scripts/init-premount/brltty
+        - debian/initramfs/scripts/init-top/brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+        - debian/brltty.postinst
+      + add ubiquity integration to propagate any brltty configuration to the
+        target system
+        - debian/31brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+      + add udev rules file that uses brltty-udev.service to activate via
+        systemd
+        - debian/brltty-udev.service
+        - debian/brltty.dirs
+        - debian/brltty.udev.rules
+        - debian/rules
+      + disable brltty.service by default, but enable it if the user configures
+        Braille at install time for a non-USB display
+        - debian/31brltty
+        - debian/rules
+      + don't install /etc/brltty.conf in the package
+        - debian/31brltty
+      + debian/brltty.udev.rules: don't claim generic USB device IDs it leads
+        to brltty grabbing serial ports which other devices like Arduinos
+        boards can't use anymore
+
+ -- Steve Langasek <[e-mail]>  Thu, 18 May 2023 08:32:55 -0700
+
 brltty (6.5-7) unstable; urgency=medium
 
   [ Remus-Gabriel Chelu ]
@@ -82,6 +282,59 @@ brltty (6.5-6) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Tue, 06 Dec 2022 22:25:48 +0100
 
+brltty (6.5-5ubuntu3) lunar; urgency=medium
+
+  * Rebuild against latest icu
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 04 Feb 2023 14:27:29 -0500
+
+brltty (6.5-5ubuntu2) lunar; urgency=medium
+
+  * Fix accidentally uploaded merge conflict
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Thu, 24 Nov 2022 09:55:15 -0600
+
+brltty (6.5-5ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remaining changes:
+      + add brltty-setup
+        - debian/brltty-setup
+        - debian/brltty.install
+        - debian/rules
+      + add initramfs integration to run brltty-setup if necessary before
+        plymouth starts
+        - debian/control
+        - debian/initramfs/brltty.sh
+        - debian/initramfs/hooks/brltty.in
+        - debian/initramfs/scripts/init-premount/brltty
+        - debian/initramfs/scripts/init-top/brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+        - debian/brltty.postinst
+      + add ubiquity integration to propagate any brltty configuration to the
+        target system
+        - debian/31brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+      + add udev rules file that uses brltty-udev.service to activate via
+        systemd
+        - debian/brltty-udev.service
+        - debian/brltty.dirs
+        - debian/brltty.udev.rules
+        - debian/rules
+      + disable brltty.service by default, but enable it if the user configures
+        Braille at install time for a non-USB display
+        - debian/31brltty
+        - debian/rules
+      + don't install /etc/brltty.conf in the package
+        - debian/31brltty
+      + debian/brltty.udev.rules: don't claim generic USB device IDs it leads
+        to brltty grabbing serial ports which other devices like Arduinos
+        boards can't use anymore
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Fri, 23 Nov 2022 16:22:13 +0000
+
 brltty (6.5-5) unstable; urgency=medium
 
   [ Samuel Thibault ]
@@ -116,6 +369,53 @@ brltty (6.5-4) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sat, 17 Sep 2022 21:01:50 +0200
 
+brltty (6.5-3ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild with Python 3.11 as supported
+
+ -- Graham Inggs <[e-mail]>  Thu, 03 Nov 2022 15:39:30 +0000
+
+brltty (6.5-3ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remaining changes:
+      + add brltty-setup
+        - debian/brltty-setup
+        - debian/brltty.install
+        - debian/rules
+      + add initramfs integration to run brltty-setup if necessary before
+        plymouth starts
+        - debian/control
+        - debian/initramfs/brltty.sh
+        - debian/initramfs/hooks/brltty.in
+        - debian/initramfs/scripts/init-premount/brltty
+        - debian/initramfs/scripts/init-top/brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+        - debian/brltty.postinst
+      + add ubiquity integration to propagate any brltty configuration to the
+        target system
+        - debian/31brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+      + add udev rules file that uses brltty-udev.service to activate via
+        systemd
+        - debian/brltty-udev.service
+        - debian/brltty.dirs
+        - debian/brltty.udev.rules
+        - debian/rules
+      + disable brltty.service by default, but enable it if the user configures
+        Braille at install time for a non-USB display
+        - debian/31brltty
+        - debian/rules
+      + don't install /etc/brltty.conf in the package
+        - debian/31brltty
+      + debian/brltty.udev.rules: don't claim generic USB device IDs it leads
+        to brltty grabbing serial ports which other devices like Arduinos
+        boards can't use anymore
+
+ -- Steve Langasek <[e-mail]>  Mon, 15 Aug 2022 20:28:46 -0700
+
 brltty (6.5-3) unstable; urgency=medium
 
   * debian/brltty-udeb.sh: Automatically shrink d-i width to 80 columns, as
@@ -148,6 +448,47 @@ brltty (6.5-1) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sat, 11 Jun 2022 18:59:43 +0200
 
+brltty (6.4-6ubuntu1) kinetic; urgency=medium
+
+  * Resynchronize on Debian
+    - Remaining changes:
+      + add brltty-setup
+        - debian/brltty-setup
+        - debian/brltty.install
+        - debian/rules
+      + add initramfs integration to run brltty-setup if necessary before
+        plymouth starts
+        - debian/control
+        - debian/initramfs/brltty.sh
+        - debian/initramfs/hooks/brltty.in
+        - debian/initramfs/scripts/init-premount/brltty
+        - debian/initramfs/scripts/init-top/brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+        - debian/brltty.postinst
+      + add ubiquity integration to propagate any brltty configuration to the
+        target system
+        - debian/31brltty
+        - debian/brltty.dirs
+        - debian/brltty.install
+      + add udev rules file that uses brltty-udev.service to activate via
+        systemd
+        - debian/brltty-udev.service
+        - debian/brltty.dirs
+        - debian/brltty.udev.rules
+        - debian/rules
+      + disable brltty.service by default, but enable it if the user configures
+        Braille at install time for a non-USB display
+        - debian/31brltty
+        - debian/rules
+      + don't install /etc/brltty.conf in the package
+        - debian/31brltty
+      + debian/brltty.udev.rules: don't claim generic USB device IDs it leads
+        to brltty grabbing serial ports which other devices like Arduinos
+        boards can't use anymore, thanks Samuel Thibault (lp: #1958224)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 12 May 2022 16:01:05 +0200
+
 brltty (6.4-6) unstable; urgency=medium
 
   * patches/paste-newlines: Fix pasting newlines in X with the brltty
@@ -1991,3 +2332,4 @@ brltty (2.98-1) unstable; urgency=low
   * Initial Release.
 
  -- Mario Lang <[e-mail]>  Thu,  4 Jan 2001 16:22:12 +0100
+
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d07280d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/brltty.udev.rules
diff --git a/debian/control b/debian/control
index aa3a78e..a1e0c4d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: brltty
 Section: admin
 Priority: optional
-Maintainer: Debian Accessibility Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Accessibility Team <[e-mail]>
 Uploaders: Samuel Thibault <[e-mail]>
 Vcs-Browser: https://salsa.debian.org/a11y-team/brltty
 Vcs-Git: https://salsa.debian.org/a11y-team/brltty.git
diff --git a/debian/initramfs/brltty.sh b/debian/initramfs/brltty.sh
new file mode 100644
index 0000000..c3cb28a
--- /dev/null
+++ b/debian/initramfs/brltty.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+set -e
+
+# A fake /lib/brltty/brltty.sh for the initramfs. Rather than actually
+# starting brltty (which is problematic because brltty would have to be shut
+# down and restarted when switching out of early userspace), we just write
+# out a brltty.conf which will be copied over to the real root filesystem
+# later.
+
+brailleDriver=auto
+brailleDevice=usb:
+
+while [ "$1" ]; do
+	case $1 in
+		-b)
+			brailleDriver="$2"
+			shift 2
+			;;
+		-d)
+			brailleDevice="$2"
+			shift 2
+			;;
+		-*)
+			shift 2
+			;;
+		*)
+			shift
+			;;
+	esac
+done
+
+cat >/dev/.initramfs/brltty.conf <<EOF
+# Created by $0
+braille-driver $brailleDriver
+braille-device $brailleDevice
+EOF
+
+exit 0
diff --git a/debian/initramfs/hooks/brltty.in b/debian/initramfs/hooks/brltty.in
index d43e19c..1b8d132 100755
--- a/debian/initramfs/hooks/brltty.in
+++ b/debian/initramfs/hooks/brltty.in
@@ -1,5 +1,6 @@
 #!/bin/sh -e
 
+OPTION=FRAMEBUFFER
 PREREQS=""
 
 prereqs() { echo "$PREREQS"; }
@@ -43,4 +44,9 @@ if [ "$START_IN_INITRAMFS" = "true" -o "$START_IN_INITRAMFS" = "yes" ]; then
   manual_add_modules uinput
 
   echo "done"
+else
+  mkdir -p $DESTDIR/lib/brltty
+  copy_exec /usr/share/brltty/initramfs/brltty.sh /lib/brltty
+  mkdir -p $DESTDIR/sbin
+  copy_exec /sbin/brltty-setup /sbin
 fi
diff --git a/debian/initramfs/scripts/init-premount/brltty b/debian/initramfs/scripts/init-premount/brltty
index 0016fae..1e786bd 100755
--- a/debian/initramfs/scripts/init-premount/brltty
+++ b/debian/initramfs/scripts/init-premount/brltty
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+OPTION=FRAMEBUFFER
 PREREQ="udev"
 prereqs()
 {
@@ -15,9 +16,6 @@ esac
 
 [ -x /bin/brltty ] || exit 0
 
-[ -d /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb
-cp /proc/mounts /etc/mtab
-
 # Start BRLTTY
 if [ -r /etc/brltty.conf ]; then
   /bin/brltty -P /run/brltty-initramfs.pid -eqN 2>/dev/tty2
diff --git a/debian/initramfs/scripts/init-top/brltty b/debian/initramfs/scripts/init-top/brltty
new file mode 100644
index 0000000..a6ea78d
--- /dev/null
+++ b/debian/initramfs/scripts/init-top/brltty
@@ -0,0 +1,22 @@
+#! /bin/sh
+set -e
+
+OPTION=FRAMEBUFFER
+PREREQ="framebuffer console_setup"
+
+prereqs () {
+	echo "$PREREQ"
+}
+
+case $1 in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+if grep -q braille=ask /proc/cmdline; then
+	brltty-setup || true
+fi
+
+exit 0
diff --git a/debian/rules b/debian/rules
index cb9b448..916496b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -154,7 +154,12 @@ binary-indep: brltty
 # Build architecture-dependent files here.
 binary-arch: brltty $(if $(with_udeb),brltty-udeb)
 
-brltty: build-brltty build-python
+debian/brltty.udev.rules: debian/brltty-udeb.udev.rules debian/brltty.udev.rules.patch
+	patch -p0 -F0 -o debian/brltty.udev.rules \
+		debian/brltty-udeb.udev.rules \
+		debian/brltty.udev.rules.patch
+
+brltty: debian/brltty.udev.rules build-brltty build-python
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -182,8 +187,11 @@ brltty: build-brltty build-python
 	for file in Drivers/Braille/*/README*; \
 		do cp $$file `pwd`/debian/$(PACKAGE)/usr/share/doc/brltty/`basename $$(dirname $$file)`.`basename $$file`; \
 		done
+	cp debian/brltty.udev.rules debian/$@/lib/udev/rules.d/85-brltty.rules
+	dh_installsystemd -p$@ --no-enable
+	dh_installsystemd -p$@ --name brltty-udev
 	# -r because we don't want to lose the console on an upgrade
-	dh_installinit -p$@ -r -- start 25 S .
+	# dh_installinit -p$@ -r -- start 25 S .
 	# and likewise for systemd
 	dh_installsystemd -p$@ --restart-after-upgrade
 	dh_installchangelogs Documents/ChangeLog
@@ -266,6 +274,7 @@ brltty-udeb: build-udeb
 	cp debian/brltty-udeb.udev.rules debian/$@/lib/udev/rules.d/brltty.rules
 	cp debian/brltty-udeb.udev.sh debian/$@/lib/udev/brltty.sh
 	chmod +x debian/$@/lib/udev/brltty.sh
+	install -m755 debian/brltty-setup debian/$@/sbin/brltty-setup
 	cp debian/brltty-udeb.sh debian/$@/lib/brltty/brltty.sh
 	chmod +x debian/$@/lib/brltty/brltty.sh
 	mkdir -p debian/$@/usr/share/brltty-udeb