Commit b87f9914795e7f01bfa3d2679d4e73b70f62890a

Authored by samuel thibault
1 parent 3e9b82b0

New upstream release

    - patches/defauth-keyfile.patch, defauth-polkit, git-braillenote.patch,
      git-lsystemd.patch, git-manufacturer.patch, git-reproducible.patch,
      git-speech-crash.patch, git-vario-ultra-restart.patch, wait-polkit,
      xbrlapi-nospam.patch, xbrlapi-setfocus.patch, xbrlapi.patch: Remove
      patches, merged upstream.
    - patches/20-sbin.patch: update patch.
    - org.a11y.brltty.metainfo.xml, 60xbrlapi, xbrlapi.desktop: Remove files,
      merged upstream.
  * patches/api_startup.patch: Fix race between socket setup and select().
  * brltty-udeb.udev.rules: Update.
debian/60xbrlapi
... ... @@ -1 +0,0 @@
1   -if [ -x /usr/bin/xbrlapi ]; then /usr/bin/xbrlapi -q 2> /dev/null & fi
debian/brltty-udeb.udev.rules
... ... @@ -107,6 +107,7 @@ ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0003", RUN+="/lib/udev/brltty.sh -b
107 107 ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0044", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
108 108 ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0054", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
109 109 ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0055", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
  110 +ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0061", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
110 111 ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0064", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
111 112 ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0074", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
112 113 ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0081", RUN+="/lib/udev/brltty.sh -b ht -d usb:"
... ... @@ -125,6 +126,7 @@ ATTRS{idVendor}=="045e", ATTRS{idProduct}=="930b", RUN+="/lib/udev/brltty.sh -b
125 126 # HumanWare
126 127 ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c005", RUN+="/lib/udev/brltty.sh -b hw -d usb:"
127 128 ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c006", RUN+="/lib/udev/brltty.sh -b hw -d usb:"
  129 +ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c00a", RUN+="/lib/udev/brltty.sh -b hw -d usb:"
128 130  
129 131 # BrailleMemo
130 132 ATTRS{idVendor}=="1148", ATTRS{idProduct}=="0301", RUN+="/lib/udev/brltty.sh -b mm -d usb:"
... ...
debian/brltty.examples
1   -Autostart/Udev/udev.rules
  1 +Autostart/Udev/rules
  2 +Autostart/Udev/brltty-wrapper
2 3 Autostart/Upstart/brltty.conf
... ...
debian/brltty.install
... ... @@ -9,5 +9,5 @@ debian/tmp/lib/brltty lib
9 9 debian/tmp/usr/share/locale
10 10 debian/initramfs/hooks/brltty usr/share/initramfs-tools/hooks
11 11 debian/initramfs/scripts/init-premount/brltty usr/share/initramfs-tools/scripts/init-premount
12   -Authorization/Polkit/org.brltty.policy /usr/share/polkit-1/actions
13   -debian/org.a11y.brltty.metainfo.xml /usr/share/metainfo
  12 +debian/tmp/usr/share/polkit-1/actions
  13 +debian/tmp/usr/share/metainfo
... ...
debian/changelog
1   -brltty (5.4-8) UNRELEASED; urgency=medium
  1 +brltty (5.5-1) experimental; urgency=medium
2 2  
3 3 * git-reproducible.patch: Make the build reproducible, thanks Chris West for
4 4 the patch (Closes: Bug#859959).
  5 + * New upstream release
  6 + - patches/defauth-keyfile.patch, defauth-polkit, git-braillenote.patch,
  7 + git-lsystemd.patch, git-manufacturer.patch, git-reproducible.patch,
  8 + git-speech-crash.patch, git-vario-ultra-restart.patch, wait-polkit,
  9 + xbrlapi-nospam.patch, xbrlapi-setfocus.patch, xbrlapi.patch: Remove
  10 + patches, merged upstream.
  11 + - patches/20-sbin.patch: update patch.
  12 + - org.a11y.brltty.metainfo.xml, 60xbrlapi, xbrlapi.desktop: Remove files,
  13 + merged upstream.
  14 + * patches/api_startup.patch: Fix race between socket setup and select().
  15 + * brltty-udeb.udev.rules: Update.
5 16  
6   - -- Samuel Thibault <sthibault@debian.org> Sun, 09 Apr 2017 22:00:11 +0200
  17 + -- Samuel Thibault <sthibault@debian.org> Mon, 22 May 2017 01:43:35 +0200
7 18  
8 19 brltty (5.4-7) unstable; urgency=medium
9 20  
... ...
debian/control
... ... @@ -6,7 +6,7 @@ Uploaders: Samuel Thibault &lt;sthibault@debian.org&gt;
6 6 Vcs-Browser: https://anonscm.debian.org/git/pkg-a11y/brltty.git
7 7 Vcs-Git: https://anonscm.debian.org/git/pkg-a11y/brltty.git
8 8 Homepage: https://brltty.com
9   -Build-Depends: debhelper (>= 9.20150628), dh-lisp, dh-systemd (>= 1.5), dh-strip-nondeterminism,
  9 +Build-Depends: debhelper (>= 9.20150628), dh-lisp, dh-python, dh-systemd (>= 1.5), dh-strip-nondeterminism,
10 10 autotools-dev, autoconf, pkg-config, tcl (>= 8.5~),
11 11 libasound2-dev [linux-any],
12 12 python-all-dev (>= 2.7~0),
... ...
debian/org.a11y.brltty.metainfo.xml
... ... @@ -1,452 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -
3   -<!--
4   - Copyright (C) 1995-2016 by The BRLTTY Developers.
5   -
6   - This file is provided, free of charge and as-is, under the terms of the
7   - All Permissive License as published by the Free Software Foundation.
8   - Please see: https://spdx.org/licenses/FSFAP.html
9   -
10   - Copying and distribution of this file, with or without modification,
11   - are permitted in any medium without royalty provided the copyright
12   - notice and this notice are preserved. This file is offered as-is,
13   - without any warranty.
14   --->
15   -
16   -<!--
17   - While the license does permit modification, the copyright holder will
18   - appreciate it if modifications were restricted to the modalias list,
19   - and that the rest of the metadata remain as it was originally written.
20   --->
21   -
22   -<component>
23   - <id>org.a11y.brltty</id>
24   - <name>BRLTTY</name>
25   - <summary>Support for braille devices</summary>
26   -
27   - <description>
28   - A background process providing access to the console screen (when in
29   - text mode) for a blind person using a refreshable braille display.
30   - </description>
31   -
32   - <developer_name>The BRLTTY Developers</developer_name>
33   - <url type="homepage">http://brltty.com/</url>
34   -
35   - <metadata_license>FSFAP</metadata_license>
36   - <project_license>GPL-2.0</project_license>
37   -
38   - <provides>
39   - <!-- BEGIN_USB_DEVICES -->
40   -
41   - <!-- Device: 0403:6001 -->
42   - <!-- Generic Identifier -->
43   - <!-- Vendor: Future Technology Devices International, Ltd -->
44   - <!-- Product: FT232 USB-Serial (UART) IC -->
45   - <!-- Albatross [all models] -->
46   - <!-- Cebra [all models] -->
47   - <!-- HIMS [Sync Braille] -->
48   - <!-- HandyTech [FTDI chip] -->
49   - <!-- MDV [all models] -->
50   - <!--<modalias>usb:v0403p6001*</modalias>-->
51   -
52   - <!-- Device: 0403:DE58 -->
53   - <!-- Hedo [MobilLine] -->
54   - <modalias>usb:v0403pDE58*</modalias>
55   -
56   - <!-- Device: 0403:DE59 -->
57   - <!-- Hedo [ProfiLine] -->
58   - <modalias>usb:v0403pDE59*</modalias>
59   -
60   - <!-- Device: 0403:F208 -->
61   - <!-- Papenmeier [all models] -->
62   - <modalias>usb:v0403pF208*</modalias>
63   -
64   - <!-- Device: 0403:FE70 -->
65   - <!-- Baum [Vario 40 (40 cells)] -->
66   - <modalias>usb:v0403pFE70*</modalias>
67   -
68   - <!-- Device: 0403:FE71 -->
69   - <!-- Baum [PocketVario (24 cells)] -->
70   - <modalias>usb:v0403pFE71*</modalias>
71   -
72   - <!-- Device: 0403:FE72 -->
73   - <!-- Baum [SuperVario 40 (40 cells)] -->
74   - <modalias>usb:v0403pFE72*</modalias>
75   -
76   - <!-- Device: 0403:FE73 -->
77   - <!-- Baum [SuperVario 32 (32 cells)] -->
78   - <modalias>usb:v0403pFE73*</modalias>
79   -
80   - <!-- Device: 0403:FE74 -->
81   - <!-- Baum [SuperVario 64 (64 cells)] -->
82   - <modalias>usb:v0403pFE74*</modalias>
83   -
84   - <!-- Device: 0403:FE75 -->
85   - <!-- Baum [SuperVario 80 (80 cells)] -->
86   - <modalias>usb:v0403pFE75*</modalias>
87   -
88   - <!-- Device: 0403:FE76 -->
89   - <!-- Baum [VarioPro 80 (80 cells)] -->
90   - <modalias>usb:v0403pFE76*</modalias>
91   -
92   - <!-- Device: 0403:FE77 -->
93   - <!-- Baum [VarioPro 64 (64 cells)] -->
94   - <modalias>usb:v0403pFE77*</modalias>
95   -
96   - <!-- Device: 0452:0100 -->
97   - <!-- Metec [all models] -->
98   - <modalias>usb:v0452p0100*</modalias>
99   -
100   - <!-- Device: 045E:930A -->
101   - <!-- HIMS [Braille Sense (USB 1.1)] -->
102   - <!-- HIMS [Braille Sense (USB 2.0)] -->
103   - <!-- HIMS [Braille Sense U2 (USB 2.0)] -->
104   - <modalias>usb:v045Ep930A*</modalias>
105   -
106   - <!-- Device: 045E:930B -->
107   - <!-- HIMS [Braille Edge] -->
108   - <modalias>usb:v045Ep930B*</modalias>
109   -
110   - <!-- Device: 06B0:0001 -->
111   - <!-- Alva [Satellite (5nn)] -->
112   - <modalias>usb:v06B0p0001*</modalias>
113   -
114   - <!-- Device: 0798:0001 -->
115   - <!-- Voyager [all models] -->
116   - <modalias>usb:v0798p0001*</modalias>
117   -
118   - <!-- Device: 0798:0600 -->
119   - <!-- Alva [Voyager Protocol Converter] -->
120   - <modalias>usb:v0798p0600*</modalias>
121   -
122   - <!-- Device: 0798:0624 -->
123   - <!-- Alva [BC624] -->
124   - <modalias>usb:v0798p0624*</modalias>
125   -
126   - <!-- Device: 0798:0640 -->
127   - <!-- Alva [BC640] -->
128   - <modalias>usb:v0798p0640*</modalias>
129   -
130   - <!-- Device: 0798:0680 -->
131   - <!-- Alva [BC680] -->
132   - <modalias>usb:v0798p0680*</modalias>
133   -
134   - <!-- Device: 0904:2000 -->
135   - <!-- Baum [VarioPro 40 (40 cells)] -->
136   - <modalias>usb:v0904p2000*</modalias>
137   -
138   - <!-- Device: 0904:2001 -->
139   - <!-- Baum [EcoVario 24 (24 cells)] -->
140   - <modalias>usb:v0904p2001*</modalias>
141   -
142   - <!-- Device: 0904:2002 -->
143   - <!-- Baum [EcoVario 40 (40 cells)] -->
144   - <modalias>usb:v0904p2002*</modalias>
145   -
146   - <!-- Device: 0904:2007 -->
147   - <!-- Baum [VarioConnect 40 (40 cells)] -->
148   - <modalias>usb:v0904p2007*</modalias>
149   -
150   - <!-- Device: 0904:2008 -->
151   - <!-- Baum [VarioConnect 32 (32 cells)] -->
152   - <modalias>usb:v0904p2008*</modalias>
153   -
154   - <!-- Device: 0904:2009 -->
155   - <!-- Baum [VarioConnect 24 (24 cells)] -->
156   - <modalias>usb:v0904p2009*</modalias>
157   -
158   - <!-- Device: 0904:2010 -->
159   - <!-- Baum [VarioConnect 64 (64 cells)] -->
160   - <modalias>usb:v0904p2010*</modalias>
161   -
162   - <!-- Device: 0904:2011 -->
163   - <!-- Baum [VarioConnect 80 (80 cells)] -->
164   - <modalias>usb:v0904p2011*</modalias>
165   -
166   - <!-- Device: 0904:2014 -->
167   - <!-- Baum [EcoVario 32 (32 cells)] -->
168   - <modalias>usb:v0904p2014*</modalias>
169   -
170   - <!-- Device: 0904:2015 -->
171   - <!-- Baum [EcoVario 64 (64 cells)] -->
172   - <modalias>usb:v0904p2015*</modalias>
173   -
174   - <!-- Device: 0904:2016 -->
175   - <!-- Baum [EcoVario 80 (80 cells)] -->
176   - <modalias>usb:v0904p2016*</modalias>
177   -
178   - <!-- Device: 0904:3000 -->
179   - <!-- Baum [Refreshabraille 18 (18 cells)] -->
180   - <modalias>usb:v0904p3000*</modalias>
181   -
182   - <!-- Device: 0904:3001 -->
183   - <!-- Baum [Refreshabraille 18 (18 cells)] -->
184   - <modalias>usb:v0904p3001*</modalias>
185   -
186   - <!-- Device: 0904:4004 -->
187   - <!-- Baum [Pronto! V3 18 (18 cells)] -->
188   - <modalias>usb:v0904p4004*</modalias>
189   -
190   - <!-- Device: 0904:4005 -->
191   - <!-- Baum [Pronto! V3 40 (40 cells)] -->
192   - <modalias>usb:v0904p4005*</modalias>
193   -
194   - <!-- Device: 0904:4007 -->
195   - <!-- Baum [Pronto! V4 18 (18 cells)] -->
196   - <modalias>usb:v0904p4007*</modalias>
197   -
198   - <!-- Device: 0904:4008 -->
199   - <!-- Baum [Pronto! V4 40 (40 cells)] -->
200   - <modalias>usb:v0904p4008*</modalias>
201   -
202   - <!-- Device: 0904:6001 -->
203   - <!-- Baum [SuperVario2 40 (40 cells)] -->
204   - <modalias>usb:v0904p6001*</modalias>
205   -
206   - <!-- Device: 0904:6002 -->
207   - <!-- Baum [PocketVario2 (24 cells)] -->
208   - <modalias>usb:v0904p6002*</modalias>
209   -
210   - <!-- Device: 0904:6003 -->
211   - <!-- Baum [SuperVario2 32 (32 cells)] -->
212   - <modalias>usb:v0904p6003*</modalias>
213   -
214   - <!-- Device: 0904:6004 -->
215   - <!-- Baum [SuperVario2 64 (64 cells)] -->
216   - <modalias>usb:v0904p6004*</modalias>
217   -
218   - <!-- Device: 0904:6005 -->
219   - <!-- Baum [SuperVario2 80 (80 cells)] -->
220   - <modalias>usb:v0904p6005*</modalias>
221   -
222   - <!-- Device: 0904:6006 -->
223   - <!-- Baum [Brailliant2 40 (40 cells)] -->
224   - <modalias>usb:v0904p6006*</modalias>
225   -
226   - <!-- Device: 0904:6007 -->
227   - <!-- Baum [Brailliant2 24 (24 cells)] -->
228   - <modalias>usb:v0904p6007*</modalias>
229   -
230   - <!-- Device: 0904:6008 -->
231   - <!-- Baum [Brailliant2 32 (32 cells)] -->
232   - <modalias>usb:v0904p6008*</modalias>
233   -
234   - <!-- Device: 0904:6009 -->
235   - <!-- Baum [Brailliant2 64 (64 cells)] -->
236   - <modalias>usb:v0904p6009*</modalias>
237   -
238   - <!-- Device: 0904:600A -->
239   - <!-- Baum [Brailliant2 80 (80 cells)] -->
240   - <modalias>usb:v0904p600A*</modalias>
241   -
242   - <!-- Device: 0904:6011 -->
243   - <!-- Baum [VarioConnect 24 (24 cells)] -->
244   - <modalias>usb:v0904p6011*</modalias>
245   -
246   - <!-- Device: 0904:6012 -->
247   - <!-- Baum [VarioConnect 32 (32 cells)] -->
248   - <modalias>usb:v0904p6012*</modalias>
249   -
250   - <!-- Device: 0904:6013 -->
251   - <!-- Baum [VarioConnect 40 (40 cells)] -->
252   - <modalias>usb:v0904p6013*</modalias>
253   -
254   - <!-- Device: 0904:6101 -->
255   - <!-- Baum [VarioUltra 20 (20 cells)] -->
256   - <modalias>usb:v0904p6101*</modalias>
257   -
258   - <!-- Device: 0904:6102 -->
259   - <!-- Baum [VarioUltra 40 (40 cells)] -->
260   - <modalias>usb:v0904p6102*</modalias>
261   -
262   - <!-- Device: 0904:6103 -->
263   - <!-- Baum [VarioUltra 32 (32 cells)] -->
264   - <modalias>usb:v0904p6103*</modalias>
265   -
266   - <!-- Device: 0921:1200 -->
267   - <!-- HandyTech [GoHubs chip] -->
268   - <modalias>usb:v0921p1200*</modalias>
269   -
270   - <!-- Device: 0F4E:0100 -->
271   - <!-- FreedomScientific [Focus 1] -->
272   - <modalias>usb:v0F4Ep0100*</modalias>
273   -
274   - <!-- Device: 0F4E:0111 -->
275   - <!-- FreedomScientific [PAC Mate] -->
276   - <modalias>usb:v0F4Ep0111*</modalias>
277   -
278   - <!-- Device: 0F4E:0112 -->
279   - <!-- FreedomScientific [Focus 2] -->
280   - <modalias>usb:v0F4Ep0112*</modalias>
281   -
282   - <!-- Device: 0F4E:0114 -->
283   - <!-- FreedomScientific [Focus Blue] -->
284   - <modalias>usb:v0F4Ep0114*</modalias>
285   -
286   - <!-- Device: 10C4:EA60 -->
287   - <!-- Generic Identifier -->
288   - <!-- Vendor: Cygnal Integrated Products, Inc. -->
289   - <!-- Product: CP210x UART Bridge / myAVR mySmartUSB light -->
290   - <!-- BrailleMemo [Pocket] -->
291   - <!-- Seika [Braille Display] -->
292   - <!--<modalias>usb:v10C4pEA60*</modalias>-->
293   -
294   - <!-- Device: 10C4:EA80 -->
295   - <!-- Generic Identifier -->
296   - <!-- Vendor: Cygnal Integrated Products, Inc. -->
297   - <!-- Product: CP210x UART Bridge -->
298   - <!-- Seika [Note Taker] -->
299   - <!--<modalias>usb:v10C4pEA80*</modalias>-->
300   -
301   - <!-- Device: 1148:0301 -->
302   - <!-- BrailleMemo [Smart] -->
303   - <modalias>usb:v1148p0301*</modalias>
304   -
305   - <!-- Device: 1C71:C004 -->
306   - <!-- BrailleNote [HumanWare APEX] -->
307   - <modalias>usb:v1C71pC004*</modalias>
308   -
309   - <!-- Device: 1C71:C005 -->
310   - <!-- HumanWare [all models (serial protocol)] -->
311   - <modalias>usb:v1C71pC005*</modalias>
312   -
313   - <!-- Device: 1C71:C006 -->
314   - <!-- HumanWare [all models (HID protocol)] -->
315   - <modalias>usb:v1C71pC006*</modalias>
316   -
317   - <!-- Device: 1FE4:0003 -->
318   - <!-- HandyTech [USB-HID adapter] -->
319   - <modalias>usb:v1FE4p0003*</modalias>
320   -
321   - <!-- Device: 1FE4:0044 -->
322   - <!-- HandyTech [Easy Braille (HID)] -->
323   - <modalias>usb:v1FE4p0044*</modalias>
324   -
325   - <!-- Device: 1FE4:0054 -->
326   - <!-- HandyTech [Active Braille] -->
327   - <modalias>usb:v1FE4p0054*</modalias>
328   -
329   - <!-- Device: 1FE4:0055 -->
330   - <!-- HandyTech [Connect Braille 40] -->
331   - <modalias>usb:v1FE4p0055*</modalias>
332   -
333   - <!-- Device: 1FE4:0061 -->
334   - <!-- HandyTech [Actilino] -->
335   - <modalias>usb:v1FE4p0061*</modalias>
336   -
337   - <!-- Device: 1FE4:0064 -->
338   - <!-- HandyTech [Active Star 40] -->
339   - <modalias>usb:v1FE4p0064*</modalias>
340   -
341   - <!-- Device: 1FE4:0074 -->
342   - <!-- HandyTech [Braille Star 40 (HID)] -->
343   - <modalias>usb:v1FE4p0074*</modalias>
344   -
345   - <!-- Device: 1FE4:0081 -->
346   - <!-- HandyTech [Basic Braille 16] -->
347   - <modalias>usb:v1FE4p0081*</modalias>
348   -
349   - <!-- Device: 1FE4:0082 -->
350   - <!-- HandyTech [Basic Braille 20] -->
351   - <modalias>usb:v1FE4p0082*</modalias>
352   -
353   - <!-- Device: 1FE4:0083 -->
354   - <!-- HandyTech [Basic Braille 32] -->
355   - <modalias>usb:v1FE4p0083*</modalias>
356   -
357   - <!-- Device: 1FE4:0084 -->
358   - <!-- HandyTech [Basic Braille 40] -->
359   - <modalias>usb:v1FE4p0084*</modalias>
360   -
361   - <!-- Device: 1FE4:0086 -->
362   - <!-- HandyTech [Basic Braille 64] -->
363   - <modalias>usb:v1FE4p0086*</modalias>
364   -
365   - <!-- Device: 1FE4:0087 -->
366   - <!-- HandyTech [Basic Braille 80] -->
367   - <modalias>usb:v1FE4p0087*</modalias>
368   -
369   - <!-- Device: 1FE4:008A -->
370   - <!-- HandyTech [Basic Braille 48] -->
371   - <modalias>usb:v1FE4p008A*</modalias>
372   -
373   - <!-- Device: 1FE4:008B -->
374   - <!-- HandyTech [Basic Braille 160] -->
375   - <modalias>usb:v1FE4p008B*</modalias>
376   -
377   - <!-- Device: 4242:0001 -->
378   - <!-- Pegasus [all models] -->
379   - <modalias>usb:v4242p0001*</modalias>
380   -
381   - <!-- Device: C251:1122 -->
382   - <!-- EuroBraille [Esys (version < 3.0, no SD card)] -->
383   - <modalias>usb:vC251p1122*</modalias>
384   -
385   - <!-- Device: C251:1123 -->
386   - <!-- EuroBraille [reserved] -->
387   - <modalias>usb:vC251p1123*</modalias>
388   -
389   - <!-- Device: C251:1124 -->
390   - <!-- EuroBraille [Esys (version < 3.0, with SD card)] -->
391   - <modalias>usb:vC251p1124*</modalias>
392   -
393   - <!-- Device: C251:1125 -->
394   - <!-- EuroBraille [reserved] -->
395   - <modalias>usb:vC251p1125*</modalias>
396   -
397   - <!-- Device: C251:1126 -->
398   - <!-- EuroBraille [Esys (version >= 3.0, no SD card)] -->
399   - <modalias>usb:vC251p1126*</modalias>
400   -
401   - <!-- Device: C251:1127 -->
402   - <!-- EuroBraille [reserved] -->
403   - <modalias>usb:vC251p1127*</modalias>
404   -
405   - <!-- Device: C251:1128 -->
406   - <!-- EuroBraille [Esys (version >= 3.0, with SD card)] -->
407   - <modalias>usb:vC251p1128*</modalias>
408   -
409   - <!-- Device: C251:1129 -->
410   - <!-- EuroBraille [reserved] -->
411   - <modalias>usb:vC251p1129*</modalias>
412   -
413   - <!-- Device: C251:112A -->
414   - <!-- EuroBraille [reserved] -->
415   - <modalias>usb:vC251p112A*</modalias>
416   -
417   - <!-- Device: C251:112B -->
418   - <!-- EuroBraille [reserved] -->
419   - <modalias>usb:vC251p112B*</modalias>
420   -
421   - <!-- Device: C251:112C -->
422   - <!-- EuroBraille [reserved] -->
423   - <modalias>usb:vC251p112C*</modalias>
424   -
425   - <!-- Device: C251:112D -->
426   - <!-- EuroBraille [reserved] -->
427   - <modalias>usb:vC251p112D*</modalias>
428   -
429   - <!-- Device: C251:112E -->
430   - <!-- EuroBraille [reserved] -->
431   - <modalias>usb:vC251p112E*</modalias>
432   -
433   - <!-- Device: C251:112F -->
434   - <!-- EuroBraille [reserved] -->
435   - <modalias>usb:vC251p112F*</modalias>
436   -
437   - <!-- Device: C251:1130 -->
438   - <!-- EuroBraille [Esytime (firmware 1.03, 2014-03-31)] -->
439   - <!-- EuroBraille [Esytime] -->
440   - <modalias>usb:vC251p1130*</modalias>
441   -
442   - <!-- Device: C251:1131 -->
443   - <!-- EuroBraille [reserved] -->
444   - <modalias>usb:vC251p1131*</modalias>
445   -
446   - <!-- Device: C251:1132 -->
447   - <!-- EuroBraille [reserved] -->
448   - <modalias>usb:vC251p1132*</modalias>
449   -
450   - <!-- END_USB_DEVICES -->
451   - </provides>
452   -</component>
debian/patches/20-sbin.patch
... ... @@ -3,19 +3,6 @@ Description: adust paths in startup scripts
3 3 udev rule have to be patched to run /sbin/brltty instead of /bin/brltty.
4 4 ---
5 5 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
6   -diff --git a/Autostart/Udev/udev.rules b/Autostart/Udev/udev.rules
7   -index 006d034..6516ece 100644
8   ---- a/Autostart/Udev/udev.rules
9   -+++ b/Autostart/Udev/udev.rules
10   -@@ -447,7 +447,7 @@ GOTO="brltty_end"
11   - LABEL="brltty_add"
12   - SYMLINK+="brltty/$env{BRLTTY_BRAILLE_DEVICE}"
13   - TEST=="/sys/fs/cgroup/systemd", GOTO="brltty_add_systemd"
14   --RUN+="/bin/brltty -E
15   -+RUN+="/sbin/brltty -E"
16   - GOTO="brltty_end"
17   -
18   - LABEL="brltty_add_systemd"
19 6 diff --git a/Autostart/Upstart/brltty.conf b/Autostart/Upstart/brltty.conf
20 7 index 5837b12..ac22f16 100644
21 8 --- a/Autostart/Upstart/brltty.conf
... ...
debian/patches/api_startup.patch 0 → 100644
... ... @@ -0,0 +1,48 @@
  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/defauth-keyfile.patch
... ... @@ -1,110 +0,0 @@
1   -commit 41f5c64ceb06d3cef1af1b3f474f56db1e3d2dd8
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Sat Oct 8 22:12:29 2016 -0400
4   -
5   - Fix polkit/keyfile authentication. (st)
6   -
7   - Some parts of the code were assuming that auth had to always be a keyfile,
8   - thus preventing the use of polkit+keyfile:/etc/brlapi.key as auth.
9   -
10   -diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
11   -index 0e20ec1..7a54980 100644
12   ---- a/Programs/brlapi_client.c
13   -+++ b/Programs/brlapi_client.c
14   -@@ -724,7 +724,12 @@ brlapi_fileDescriptor BRLAPI_STDCALL brlapi__openConnection(brlapi_handle_t *han
15   - case BRLAPI_AUTH_KEY: {
16   - size_t authKeyLength;
17   - int res;
18   -- if (brlapi_loadAuthKey(settings.auth, &authKeyLength, (void *) &auth->key) < 0)
19   -+ char *keyfile = brlapi_getKeyFile(settings.auth);
20   -+ if (!keyfile)
21   -+ continue;
22   -+ res = brlapi_loadAuthKey(keyfile, &authKeyLength, (void *) &auth->key);
23   -+ free(keyfile);
24   -+ if (res < 0)
25   - continue;
26   - res = brlapi_writePacket(handle->fileDescriptor, BRLAPI_PACKET_AUTH, auth,
27   - sizeof(auth->type)+authKeyLength);
28   -diff --git a/Programs/brlapi_common.h b/Programs/brlapi_common.h
29   -index 98fed09..090ce84 100644
30   ---- a/Programs/brlapi_common.h
31   -+++ b/Programs/brlapi_common.h
32   -@@ -415,3 +415,23 @@ BRLAPI(getKeyrangeMask) (brlapi_rangeType_t r, brlapi_keyCode_t code, brlapi_key
33   - brlapi_errno = BRLAPI_ERROR_INVALID_PARAMETER;
34   - return -1;
35   - }
36   -+
37   -+static char *
38   -+BRLAPI(getKeyFile)(const char *auth)
39   -+{
40   -+ const char *path;
41   -+ char *ret, *delim;
42   -+ if (!strncmp(auth,"keyfile:",8))
43   -+ path=auth+8;
44   -+ else {
45   -+ path=strstr(auth,"+keyfile:");
46   -+ if (path) path+=9;
47   -+ else path=auth;
48   -+ }
49   -+ ret=strdup(path);
50   -+ delim=strchr(ret,'+');
51   -+ if (delim)
52   -+ *delim = 0;
53   -+ return ret;
54   -+}
55   -+
56   -diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c
57   -index 3fadda2..c3b3c6e 100644
58   ---- a/Programs/brlapi_server.c
59   -+++ b/Programs/brlapi_server.c
60   -@@ -1225,6 +1225,18 @@ static void handleNewConnection(Connection *c)
61   - brlapiserver_writePacket(c->fd,BRLAPI_PACKET_VERSION,&versionPacket.data,sizeof(versionPacket.version));
62   - }
63   -
64   -+static int
65   -+hasKeyFile(const char *auth)
66   -+{
67   -+ if (isAbsolutePath(auth))
68   -+ return 1;
69   -+ if (!strncmp(auth,"keyfile:", 8))
70   -+ return 1;
71   -+ if (strstr(auth,"+keyfile:"))
72   -+ return 1;
73   -+ return 0;
74   -+}
75   -+
76   - /* Function : handleUnauthorizedConnection */
77   - /* Returns 1 if connection has to be removed */
78   - static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type, brlapi_packet_t *packet, size_t size)
79   -@@ -1252,7 +1264,7 @@ static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type,
80   - unauthConnections--;
81   - c->auth = 1;
82   - } else {
83   -- if (isAbsolutePath(auth))
84   -+ if (hasKeyFile(auth))
85   - authPacket->type[nbmethods++] = htonl(BRLAPI_AUTH_KEY);
86   - c->auth = 0;
87   - }
88   -@@ -1288,15 +1300,18 @@ static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type,
89   - if (authDescriptor) authCorrect = authPerform(authDescriptor, c->fd);
90   - break;
91   - case BRLAPI_AUTH_KEY:
92   -- if (isAbsolutePath(auth)) {
93   -- if (brlapiserver_loadAuthKey(auth,&authKeyLength,&authKey)==-1) {
94   -- logMessage(LOG_WARNING,"Unable to load API authorization key from %s: %s in %s. You may use parameter auth=none if you don't want any authorization (dangerous)", auth, strerror(brlapi_libcerrno), brlapi_errfun);
95   -+ if (hasKeyFile(auth)) {
96   -+ char *path = brlapiserver_getKeyFile(auth);
97   -+ int ret = brlapiserver_loadAuthKey(path,&authKeyLength,&authKey);
98   -+ free(path);
99   -+ if (ret==-1) {
100   -+ logMessage(LOG_WARNING,"Unable to load API authorization key from %s: %s in %s. You may use parameter auth=none if you don't want any authorization (dangerous)", path, strerror(brlapi_libcerrno), brlapi_errfun);
101   - break;
102   - }
103   - logMessage(LOG_CATEGORY(SERVER_EVENTS), "authorization key loaded");
104   - authCorrect = (remaining==authKeyLength) && (!memcmp(&authPacket->key, &authKey, authKeyLength));
105   - memset(&authKey, 0, authKeyLength);
106   -- memset(&authPacket->key, 0, authKeyLength);
107   -+ memset(&authPacket->key, 0, remaining);
108   - }
109   - break;
110   - default:
debian/patches/defauth-polkit
... ... @@ -1,11 +0,0 @@
1   ---- a/Programs/brlapi.h.in
2   -+++ b/Programs/brlapi.h.in
3   -@@ -138,7 +138,7 @@ size_t BRLAPI_STDCALL brlapi_getHandleSi
4   - /* No authentication by default on Windows */
5   - #define BRLAPI_DEFAUTH "none"
6   - #else
7   --#define BRLAPI_DEFAUTH BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
8   -+#define BRLAPI_DEFAUTH "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
9   - #endif /* BRLAPI_WIN32 */
10   -
11   - #ifdef __MINGW32__
debian/patches/git-braillenote.patch
... ... @@ -1,19 +0,0 @@
1   -commit 71e8623c494d1936e27f12270f460312beb383bf
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Wed Nov 9 14:49:00 2016 -0500
4   -
5   - The BrailleNote wasn't being autodetected when using USB. (dm)
6   -
7   -diff --git a/Programs/config.c b/Programs/config.c
8   -index 295d269..6554461 100644
9   ---- a/Programs/config.c
10   -+++ b/Programs/config.c
11   -@@ -1487,7 +1487,7 @@ activateBrailleDriver (int verify) {
12   - autodetectableDrivers = serialDrivers;
13   - } else if (isUsbDevice(&dev)) {
14   - static const char *const usbDrivers[] = {
15   -- "al", "bm", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo",
16   -+ "al", "bm", "bn", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo",
17   - NULL
18   - };
19   - autodetectableDrivers = usbDrivers;
debian/patches/git-lsystemd.patch
... ... @@ -1,28 +0,0 @@
1   -commit 00506f796c79f05e18a1959998fd4b0932155019
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Mon Oct 3 07:13:19 2016 -0400
4   -
5   - The service package libraries should be in the link list instead of in the compile list. (st)
6   -
7   -diff --git a/config.mk.in b/config.mk.in
8   -index 4e405c1..de096c9 100644
9   ---- a/config.mk.in
10   -+++ b/config.mk.in
11   -@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $
12   - ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
13   - BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
14   - OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
15   --PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
16   -+PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
17   -
18   - CC = @CC@
19   - CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
20   -@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@
21   -
22   - LD = @LD@
23   - LDFLAGS = @LDFLAGS@
24   --LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
25   -+LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SERVICE_LIBS) $(SYSTEM_LIBS) @LIBS@
26   -
27   - MKOBJ = @MKOBJ@
28   - MKMOD = @MKMOD@
debian/patches/git-manufacturer.patch
... ... @@ -1,186 +0,0 @@
1   -commit 0ee455a451f4f354159fea709d20ccedcb36fcdb
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Sun Nov 20 23:15:36 2016 -0500
4   -
5   - Add manufacturer string protection to the generic USB device definitions (Cebra and MDV not done yet). (dm)
6   -
7   ---- a/Drivers/Braille/Albatross/braille.c
8   -+++ b/Drivers/Braille/Albatross/braille.c
9   -@@ -173,9 +173,14 @@ static UsbChannel *usbChannel = NULL;
10   -
11   - static int
12   - openUsbPort (const char *device) {
13   -+ BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001)
14   -+ "Tivomatic Oy",
15   -+ END_USB_STRING_LIST
16   -+
17   - BEGIN_USB_CHANNEL_DEFINITIONS
18   - { /* all models */
19   - .vendor=0X0403, .product=0X6001,
20   -+ .manufacturers = usbManufacturers_0403_6001,
21   - .configuration=1, .interface=0, .alternative=0,
22   - .inputEndpoint=1, .outputEndpoint=2
23   - },
24   ---- a/Drivers/Braille/BrailleMemo/braille.c
25   -+++ b/Drivers/Braille/BrailleMemo/braille.c
26   -@@ -286,9 +286,14 @@ connectResource (BrailleDisplay *brl, co
27   - .baud = 9600
28   - };
29   -
30   -+ BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA60)
31   -+ "Silicon Labs",
32   -+ END_USB_STRING_LIST
33   -+
34   - BEGIN_USB_CHANNEL_DEFINITIONS
35   - { /* Pocket */
36   - .vendor=0X10C4, .product=0XEA60,
37   -+ .manufacturers = usbManufacturers_10C4_EA60,
38   - .configuration=1, .interface=0, .alternative=0,
39   - .inputEndpoint=1, .outputEndpoint=1,
40   - .serial=&serialParameters
41   ---- a/Drivers/Braille/HIMS/braille.c
42   -+++ b/Drivers/Braille/HIMS/braille.c
43   -@@ -556,6 +556,10 @@ connectResource (BrailleDisplay *brl, co
44   - .baud = 115200
45   - };
46   -
47   -+ BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001)
48   -+ "FTDI",
49   -+ END_USB_STRING_LIST
50   -+
51   - BEGIN_USB_CHANNEL_DEFINITIONS
52   - { /* Braille Sense (USB 1.1) */
53   - .version = UsbSpecificationVersion_1_1,
54   -@@ -588,6 +592,7 @@ connectResource (BrailleDisplay *brl, co
55   -
56   - { /* Sync Braille */
57   - .vendor=0X0403, .product=0X6001,
58   -+ .manufacturers = usbManufacturers_0403_6001,
59   - .configuration=1, .interface=0, .alternative=0,
60   - .inputEndpoint=1, .outputEndpoint=2,
61   - .data=&syncBrailleProtocol
62   ---- a/Drivers/Braille/HandyTech/braille.c
63   -+++ b/Drivers/Braille/HandyTech/braille.c
64   -@@ -1107,6 +1107,10 @@ connectResource (BrailleDisplay *brl, co
65   - .parity = SERIAL_PARITY_ODD
66   - };
67   -
68   -+ BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001)
69   -+ "FTDI",
70   -+ END_USB_STRING_LIST
71   -+
72   - BEGIN_USB_CHANNEL_DEFINITIONS
73   - { /* GoHubs chip */
74   - .vendor=0X0921, .product=0X1200,
75   -@@ -1117,6 +1121,7 @@ connectResource (BrailleDisplay *brl, co
76   -
77   - { /* FTDI chip */
78   - .vendor=0X0403, .product=0X6001,
79   -+ .manufacturers = usbManufacturers_0403_6001,
80   - .configuration=1, .interface=0, .alternative=0,
81   - .inputEndpoint=1, .outputEndpoint=2,
82   - .serial = &serialParameters
83   ---- a/Drivers/Braille/Seika/braille.c
84   -+++ b/Drivers/Braille/Seika/braille.c
85   -@@ -676,9 +676,18 @@ connectResource (BrailleDisplay *brl, co
86   - .baud = 9600
87   - };
88   -
89   -+ BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA60)
90   -+ "Silicon Labs",
91   -+ END_USB_STRING_LIST
92   -+
93   -+ BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA80)
94   -+ "Silicon Laboratories",
95   -+ END_USB_STRING_LIST
96   -+
97   - BEGIN_USB_CHANNEL_DEFINITIONS
98   - { /* Braille Display */
99   - .vendor=0X10C4, .product=0XEA60,
100   -+ .manufacturers = usbManufacturers_10C4_EA60,
101   - .configuration=1, .interface=0, .alternative=0,
102   - .inputEndpoint=1, .outputEndpoint=1,
103   - .serial=&serialParameters
104   -@@ -686,6 +695,7 @@ connectResource (BrailleDisplay *brl, co
105   -
106   - { /* Note Taker */
107   - .vendor=0X10C4, .product=0XEA80,
108   -+ .manufacturers = usbManufacturers_10C4_EA80,
109   - .configuration=1, .interface=0, .alternative=0,
110   - .inputEndpoint=1,
111   - .serial=&serialParameters
112   ---- a/Headers/usb_types.h
113   -+++ b/Headers/usb_types.h
114   -@@ -300,7 +300,15 @@ typedef enum {
115   - #define USB_HID_ITEM_LENGTH(item) ((item) & ~UsbHidItemType_Mask)
116   - #define USB_HID_ITEM_BIT(type) (UINT64_C(1) << ((type) >> 2))
117   -
118   -+#define BEGIN_USB_STRING_LIST(name) static const char *const name[] = {
119   -+#define END_USB_STRING_LIST NULL};
120   -+
121   - typedef struct {
122   -+ const void *data;
123   -+ const SerialParameters *serial;
124   -+ const char *const *manufacturers;
125   -+ const char *const *products;
126   -+
127   - uint16_t vendor;
128   - uint16_t product;
129   - uint16_t version;
130   -@@ -314,9 +322,6 @@ typedef struct {
131   - unsigned disableAutosuspend:1;
132   - unsigned disableEndpointReset:1;
133   - unsigned verifyInterface:1;
134   --
135   -- const SerialParameters *serial;
136   -- const void *data;
137   - } UsbChannelDefinition;
138   -
139   - #define BEGIN_USB_CHANNEL_DEFINITIONS static const UsbChannelDefinition usbChannelDefinitions[] = {
140   ---- a/Programs/usb.c
141   -+++ b/Programs/usb.c
142   -@@ -370,6 +370,34 @@ usbVerifyProductIdentifier (const UsbDev
143   - return identifier == getLittleEndian16(descriptor->idProduct);
144   - }
145   -
146   -+static int
147   -+usbVerifyStrings (
148   -+ UsbDevice *device,
149   -+ const char *const *strings,
150   -+ unsigned char number
151   -+) {
152   -+ if (!strings) return 1;
153   -+ if (!number) return 0;
154   -+
155   -+ char *string = usbGetString(device, number, 1000);
156   -+ int matched = 0;
157   -+
158   -+ if (string) {
159   -+ while (*strings) {
160   -+ if (strcmp(*strings, string) == 0) {
161   -+ matched = 1;
162   -+ break;
163   -+ }
164   -+
165   -+ strings += 1;
166   -+ }
167   -+
168   -+ free(string);
169   -+ }
170   -+
171   -+ return matched;
172   -+}
173   -+
174   - const UsbDeviceDescriptor *
175   - usbDeviceDescriptor (UsbDevice *device) {
176   - return &device->descriptor;
177   -@@ -1445,6 +1473,9 @@ usbChooseChannel (UsbDevice *device, Usb
178   - if (!usbVerifyProductIdentifier(descriptor, data->productIdentifier)) goto nextDefinition;
179   - if (!usbVerifySerialNumber(device, data->serialNumber)) goto nextDefinition;
180   -
181   -+ if (!usbVerifyStrings(device, definition->manufacturers, descriptor->iManufacturer)) goto nextDefinition;
182   -+ if (!usbVerifyStrings(device, definition->products, descriptor->iProduct)) goto nextDefinition;
183   -+
184   - if (definition->verifyInterface) {
185   - if (!usbConfigureDevice(device, definition->configuration)) goto nextDefinition;
186   - if (!usbInterfaceDescriptor(device, definition->interface, definition->alternative)) goto nextDefinition;
debian/patches/git-reproducible.patch
... ... @@ -1,19 +0,0 @@
1   -commit 9c353d590d6ca90139d0449c9a4eb8d6e1b07478
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Sun Apr 9 15:27:13 2017 -0400
4   -
5   - Remove the timestamps from the JavaDocs for load reproducibility. (st)
6   -
7   -diff --git a/Bindings/Java/Makefile.in b/Bindings/Java/Makefile.in
8   -index c4bc90e38..3a1d65feb 100644
9   ---- a/Bindings/Java/Makefile.in
10   -+++ b/Bindings/Java/Makefile.in
11   -@@ -75,7 +75,7 @@ doc: doc.made
12   -
13   - doc.made: $(JAVA_SOURCES)
14   - $(INSTALL_DIRECTORY) doc
15   -- $(JAVADOC) -quiet -d doc -author -version -use $(JAVA_SOURCES)
16   -+ $(JAVADOC) -quiet -d doc -author -notimestamp -version -use $(JAVA_SOURCES)
17   - touch $@
18   -
19   - clean::
debian/patches/git-speech-crash.patch
... ... @@ -1,35 +0,0 @@
1   -commit 5ddde1f78a35ad698df2bfb06f180a43d3d7ed7f
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Mon Sep 26 20:09:03 2016 -0400
4   -
5   - Fix a possible crash during speech thread construction. (dm)
6   -
7   -diff --git a/Programs/spk_thread.c b/Programs/spk_thread.c
8   -index 288518c..3d33ded 100644
9   ---- a/Programs/spk_thread.c
10   -+++ b/Programs/spk_thread.c
11   -@@ -80,7 +80,6 @@ typedef enum {
12   -
13   - struct SpeechDriverThreadStruct {
14   - ThreadState threadState;
15   -- unsigned stopping:1;
16   - Queue *requestQueue;
17   -
18   - volatile SpeechSynthesizer *speechSynthesizer;
19   -@@ -253,7 +252,7 @@ testThreadValidity (volatile SpeechDriverThread *sdt) {
20   -
21   - if (spk) {
22   - if (sdt == spk->driver.thread) {
23   -- if (!sdt->stopping) {
24   -+ if (sdt->threadState == THD_READY) {
25   - return 1;
26   - }
27   - }
28   -@@ -874,7 +873,6 @@ constructSpeechDriverThread (
29   -
30   - if ((sdt = malloc(sizeof(*sdt)))) {
31   - memset((void *)sdt, 0, sizeof(*sdt));
32   -- sdt->stopping = 0;
33   - setThreadState(sdt, THD_CONSTRUCTING);
34   - setResponsePending(sdt);
35   -
debian/patches/git-vario-ultra-restart.patch
... ... @@ -1,55 +0,0 @@
1   -commit 587004a914d572e6481d0a810e1b3af8cf8afaf2
2   -Author: Dave Mielke <dave@mielke.cc>
3   -Date: Sat Mar 11 21:03:18 2017 -0500
4   -
5   - USB write timeouts should be ignored for the Vario Ultra. (dm)
6   -
7   -diff --git a/Drivers/Braille/Baum/braille.c b/Drivers/Braille/Baum/braille.c
8   -index a571d319d..f137bdbe3 100644
9   ---- a/Drivers/Braille/Baum/braille.c
10   -+++ b/Drivers/Braille/Baum/braille.c
11   -@@ -3104,6 +3104,7 @@ connectResource (BrailleDisplay *brl, const char *identifier) {
12   - descriptor.serial.options.applicationData = &baumEscapeOperations;
13   -
14   - descriptor.usb.channelDefinitions = usbChannelDefinitions;
15   -+ descriptor.usb.options.ignoreWriteTimeouts = 1;
16   -
17