Commit d6e1da8ae2280e56e351d0953b9a720f27aa9bd1

Authored by samuel thibault
1 parent 44379557

Update to 5.6 release

    - debian/patches/api_startup.patch: Upstreamed.
    - debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677: Upstreamed.
    - debian/patches/brldefs-install.patch: Upstreamed.
    - debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f: Upstreamed.
    - debian/brltty-udeb.udev.rules: Add new device IDs.
    - debian/control: Add liblouis-dev build-dep.
    - debian/rules: Make brltty install appstream data.
debian/brltty-udeb.udev.rules
... ... @@ -35,6 +35,7 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe74", RUN+="/lib/udev/brltty.sh -b
35 35 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe75", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
36 36 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe76", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
37 37 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe77", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
  38 +ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a1d3", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
38 39 ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2000", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
39 40 ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2001", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
40 41 ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2002", RUN+="/lib/udev/brltty.sh -b bm -d usb:"
... ... @@ -128,6 +129,9 @@ ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c005", RUN+="/lib/udev/brltty.sh -b
128 129 ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c006", RUN+="/lib/udev/brltty.sh -b hw -d usb:"
129 130 ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c00a", RUN+="/lib/udev/brltty.sh -b hw -d usb:"
130 131  
  132 +# Inceptor
  133 +ATTRS{idVendor}=="1209", ATTRS{idProduct}=="abc0", RUN+="/lib/udev/brltty.sh -b ic -d usb:"
  134 +
131 135 # BrailleMemo
132 136 ATTRS{idVendor}=="1148", ATTRS{idProduct}=="0301", RUN+="/lib/udev/brltty.sh -b mm -d usb:"
133 137  
... ...
debian/changelog
1 1 brltty (5.6-1) experimental; urgency=medium
2 2  
3 3 * New upstream release.
  4 + - debian/patches/api_startup.patch: Upstreamed.
  5 + - debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677: Upstreamed.
  6 + - debian/patches/brldefs-install.patch: Upstreamed.
  7 + - debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f: Upstreamed.
  8 + - debian/brltty-udeb.udev.rules: Add new device IDs.
  9 + - debian/control: Add liblouis-dev build-dep.
  10 + - debian/rules: Make brltty install appstream data.
4 11  
5 12 -- Samuel Thibault <sthibault@debian.org> Sun, 11 Feb 2018 17:18:14 +0100
6 13  
... ...
debian/control
... ... @@ -13,7 +13,7 @@ Build-Depends: debhelper (&gt;= 9.20160709), dh-lisp, dh-python, dh-strip-nondeterm
13 13 python3-all-dev,
14 14 cython,
15 15 libgpmg1-dev [linux-any], libsystemd-dev [linux-any],
16   - libicu-dev,
  16 + libicu-dev, liblouis-dev,
17 17 libpolkit-gobject-1-dev,
18 18 default-jdk [!m68k],
19 19 doxygen, linuxdoc-tools, groff,
... ...
debian/patches/api_startup.patch
... ... @@ -1,48 +0,0 @@
1   -Fix race between socket creation and select preparation
2   -
3   -It can happen that between iterating over socketInfo[i].fd and testing
4   -serverSocketsPending, the sockets get established, and thus no server fd
5   -was recorded in sockset, but serverSocketsPending is found to be 0, and
6   -thus we are passing a NULL timeout to select() without any FD to look
7   -at, thus hanging.
8   -
9   ----
10   - Programs/brlapi_server.c | 20 ++++++++++----------
11   - 1 file changed, 10 insertions(+), 10 deletions(-)
12   -
13   ---- a/Programs/brlapi_server.c
14   -+++ b/Programs/brlapi_server.c
15   -@@ -2338,16 +2338,6 @@ THREAD_FUNCTION(runServer) {
16   - FD_ZERO(&sockset);
17   - fdmax=0;
18   -
19   -- for (i=0;i<serverSocketCount;i++) {
20   -- if (socketInfo[i].fd>=0) {
21   -- FD_SET(socketInfo[i].fd, &sockset);
22   --
23   -- if (socketInfo[i].fd>fdmax) {
24   -- fdmax = socketInfo[i].fd;
25   -- }
26   -- }
27   -- }
28   --
29   - lockMutex(&apiConnectionsMutex);
30   - addTtyFds(&sockset, &fdmax, &notty);
31   - addTtyFds(&sockset, &fdmax, &ttys);
32   -@@ -2357,6 +2347,16 @@ THREAD_FUNCTION(runServer) {
33   - struct timeval tv, *timeout;
34   -
35   - lockMutex(&serverSocketsMutex);
36   -+ for (i=0;i<serverSocketCount;i++) {
37   -+ if (socketInfo[i].fd>=0) {
38   -+ FD_SET(socketInfo[i].fd, &sockset);
39   -+
40   -+ if (socketInfo[i].fd>fdmax) {
41   -+ fdmax = socketInfo[i].fd;
42   -+ }
43   -+ }
44   -+ }
45   -+
46   - if (unauthConnections || serverSocketsPending) {
47   - memset(&tv, 0, sizeof(tv));
48   - tv.tv_sec = SERVER_SELECT_TIMEOUT;
debian/patches/brldefs-install.patch
... ... @@ -1,15 +0,0 @@
1   ----
2   - braille.mk | 2 +-
3   - 1 file changed, 1 insertion(+), 1 deletion(-)
4   -
5   ---- a/braille.mk
6   -+++ b/braille.mk
7   -@@ -32,7 +32,7 @@ braille-driver: $(BRL_MOD_FILE)
8   -
9   - install-api::
10   - $(INSTALL_DIRECTORY) $(INSTALL_ROOT)$(INCLUDE_DIRECTORY)
11   -- for file in *-$(DRIVER_CODE).h; do test -f $$file && $(INSTALL_DATA) $$file $(INSTALL_ROOT)$(INCLUDE_DIRECTORY); done || :
12   -+ for file in $(SRC_DIR)/*-$(DRIVER_CODE).h; do test -f $$file && $(INSTALL_DATA) $$file $(INSTALL_ROOT)$(INCLUDE_DIRECTORY); done || :
13   -
14   - install:: $(INSTALL_API)
15   -
debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677
... ... @@ -1,50 +0,0 @@
1   -commit 07ecca2240c680373e9c2e5e38241edde9d1a677
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Tue Jun 20 00:17:49 2017 -0400
4   -
5   - Remove characters \x7F-\X9F from the Finnish text table (fi). (dm)
6   -
7   -diff --git a/Tables/Text/fi.ttb b/Tables/Text/fi.ttb
8   -index 835db2fd5..c7932a2f3 100644
9   ---- a/Tables/Text/fi.ttb
10   -+++ b/Tables/Text/fi.ttb
11   -@@ -73,39 +73,6 @@ char \x7B (12 4 6 ) # 7B ⠫ { [LEFT CURLY BRACKET]
12   - char \x7C ( 456 ) # 7C ⠸ | [VERTICAL LINE]
13   - char \x7D (12 456 ) # 7D ⠻ } [RIGHT CURLY BRACKET]
14   - char \x7E ( 45 ) # 7E ⠘ ~ [TILDE]
15   --char \x7F (1234 8) # 7F ⢏ [DELETE]
16   --char \x80 ( 23 67 ) # 80 ⡦ [<control-0080>]
17   --char \x81 (12 56 ) # 81 ⠳ [<control-0081>]
18   --char \x82 (123456 ) # 82 ⠿ [BREAK PERMITTED HERE]
19   --char \x83 ( 23 678) # 83 ⣦ [NO BREAK HERE]
20   --char \x84 ( 345 ) # 84 ⠜ [<control-0084>]
21   --char \x85 ( 2345 8) # 85 ⢞ [NEXT LINE (NEL)]
22   --char \x86 (1 6 ) # 86 ⠡ [START OF SELECTED AREA]
23   --char \x87 (1234567 ) # 87 ⡿ [END OF SELECTED AREA]
24   --char \x88 (12345678) # 88 ⣿ [CHARACTER TABULATION SET]
25   --char \x89 ( 678) # 89 ⣠ [CHARACTER TABULATION WITH JUSTIFICATION]
26   --char \x8A (12345 8) # 8A ⢟ [LINE TABULATION SET]
27   --char \x8B ( 3 56 8) # 8B ⢴ [PARTIAL LINE FORWARD]
28   --char \x8C ( 45 8) # 8C ⢘ [PARTIAL LINE BACKWARD]
29   --char \x8D ( 4567 ) # 8D ⡸ [REVERSE LINE FEED]
30   --char \x8E ( 345 7 ) # 8E ⡜ [SINGLE SHIFT TWO]
31   --char \x8F (1 67 ) # 8F ⡡ [SINGLE SHIFT THREE]
32   --char \x90 (1234567 ) # 90 ⡿ [DEVICE CONTROL STRING]
33   --char \x91 (1 34 8) # 91 ⢍ [PRIVATE USE ONE]
34   --char \x92 (12 56 8) # 92 ⢳ [PRIVATE USE TWO]
35   --char \x93 ( 3 567 ) # 93 ⡴ [SET TRANSMIT STATE]
36   --char \x94 ( 2 4 6 ) # 94 ⠪ [CANCEL CHARACTER]
37   --char \x95 ( 67 ) # 95 ⡠ [MESSAGE WAITING]
38   --char \x96 (123456 8) # 96 ⢿ [START OF GUARDED AREA]
39   --char \x97 ( 3 6 8) # 97 ⢤ [END OF GUARDED AREA]
40   --char \x98 ( 2 456 8) # 98 ⢺ [START OF STRING]
41   --char \x99 ( 2 4 67 ) # 99 ⡪ [<control-0099>]
42   --char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER]
43   --char \x9B ( 4 7 ) # 9B ⡈ [CONTROL SEQUENCE INTRODUCER]
44   --char \x9C ( 7 ) # 9C ⡀ [STRING TERMINATOR]
45   --char \x9D ( 45 7 ) # 9D ⡘ [OPERATING SYSTEM COMMAND]
46   --char \x9E (1 34 6 8) # 9E ⢭ [PRIVACY MESSAGE]
47   --char \x9F (1 345 8) # 9F ⢝ [APPLICATION PROGRAM COMMAND]
48   - char \xA1 ( 23 5 8) # A1 ⢖ ¡ [INVERTED EXCLAMATION MARK]
49   - char \xA2 (1 3 56 8) # A2 ⢵ ¢ [CENT SIGN]
50   - char \xA3 (123 8) # A3 ⢇ £ [POUND SIGN]
debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f
... ... @@ -1,19 +0,0 @@
1   -commit ba42441d03c6145fe6859c90fb01b1fa16221a2f
2   -Author: Mario Lang <mlang@delysid.org>
3   -Date: Thu Nov 30 13:14:47 2017 +0100
4   -
5   - Prevent scancodes from generating spurious log messages. (ml)
6   -
7   -diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c
8   -index 53fb4a16e..4c4a9289c 100644
9   ---- a/Drivers/Braille/HandyTech/braille.c
10   -+++ b/Drivers/Braille/HandyTech/braille.c
11   -@@ -1560,7 +1560,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
12   - case HT_EXTPKT_Scancode: {
13   - while (length--)
14   - enqueueCommand(BRL_CMD_BLK(PASSAT) | BRL_ARG_PUT(*bytes++));
15   -- break;
16   -+ continue;
17   - }
18   -
19   - case HT_EXTPKT_GetRTC: {
debian/patches/series
... ... @@ -3,7 +3,3 @@
3 3 41-java-bytecode-compat.patch
4 4 50-constants.patch
5 5 disable-synth-callback.patch
6   -api_startup.patch
7   -git-07ecca2240c680373e9c2e5e38241edde9d1a677
8   -brldefs-install.patch
9   -git-ba42441d03c6145fe6859c90fb01b1fa16221a2f
... ...
debian/rules
... ... @@ -151,7 +151,7 @@ brltty: build-brltty build-python
151 151 dh_prep
152 152 dh_installdirs
153 153  
154   - $(MAKE) -C build-brltty install INSTALL_ROOT=`pwd`/debian/tmp
  154 + $(MAKE) -C build-brltty install install-appstream INSTALL_ROOT=`pwd`/debian/tmp
155 155 set -e ; for pyver in $(PYVERS); do \
156 156 $(MAKE) -C build-py$$pyver/Bindings/Python install INSTALL_ROOT=`pwd`/debian/tmp ; \
157 157 done
... ...