lp:~ubuntu-branches/ubuntu/lucid/brltty/lucid-200912100610
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/lucid/brltty/lucid-200912100610
Branch merges
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 45. By Steve Langasek
-
really merge 4.0-8, apparently some bits were missed and bzr merge-package
finds this very confusing - 44. By Steve Langasek
-
* debian/rules: don't install /etc/brltty.conf in the package - we're
dynamically editing this from the initramfs, so this really isn't suitable
to be a conffile.
* revert changes to check the md5sum before copying over the configuration
from the initramfs: the source file *only* exists when braille=ask is
passed on the kernel commandline, so there is simply no reason to *not*
respect the options specified and overwrite /etc/brltty.conf (especially
now that it's no longer a conffile). LP: #409802, #370728. - 43. By Luke Yelavich
-
* Merge from debian testing, remaining changes:
- Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev.
- Add brltty-setup, installed in both the udeb and the normal system.
- Add initramfs integration to run brltty-setup if necessary before
usplash starts.
- Add ubiquity integration to propagate any brltty configuration to the
target system.
- Add udev rules and /lib/brltty/brltty. sh to the normal (non-udeb)
package as well.
- Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set
by the installer if brltty is configured; add a NEWS entry for
upgraders.
- Install udev rules with the same name (85-brltty.rules) in the udeb as
in the deb.
- Only copy the brltty config file from the initramfs if the md5sum differs.
- Change maintainer to Ubuntu Accessibility Developers
<email address hidden>
- Disable BrlTTY grabbing devices that use the FTDI USB to serial chip.
- Remove the dh-lisp build-dependency, remove the cl-brlapi package, and
adjust the brltty package description accordingly. dh-lisp is not
in main.
- Build for python 2.6.
- Build against openjdk in Ubuntu.
- Put udev rules file in /lib/udev/rules.d.
- Enable brltty at startup on the target system if the alternate installer
is used. - 42. By Luke Yelavich
-
* Fixes cherry-picked from debian:
- debian/brltty.init: Fix incorrect LSB header, cherry-picked from Debian.
(LP: #450176)
- debian/brltty. postinst: Recover from previous init script LSB errors. - 41. By Luke Yelavich
-
* Merge from debian unstable, remaining changes:
- Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev.
- Add brltty-setup, installed in both the udeb and the normal system.
- Add initramfs integration to run brltty-setup if necessary before
usplash starts.
- Add ubiquity integration to propagate any brltty configuration to the
target system.
- Add udev rules and /lib/brltty/brltty. sh to the normal (non-udeb)
package as well.
- Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set
by the installer if brltty is configured; add a NEWS entry for
upgraders.
- Install udev rules with the same name (85-brltty.rules) in the udeb as
in the deb.
- Only copy the brltty config file from the initramfs if the md5sum differs.
- Change maintainer to Ubuntu Accessibility Developers
<email address hidden>
- Disable BrlTTY grabbing devices that use the FTDI USB to serial chip.
- Remove the dh-lisp build-dependency, remove the cl-brlapi package, and
adjust the brltty package description accordingly. dh-lisp is not
in main.
- Do not build the speechd package, speech-dispatcher is not in main.
- Build for python 2.6.
- Build against openjdk in Ubuntu.
- Put udev rules file in /lib/udev/rules.d.
- Enable brltty at startup on the target system if the alternate installer
is used. - 40. By Colin Watson
-
* Restore change from 4.0~svn4301-
0ubuntu3, since otherwise brltty builds
only with python2.5:
- Bindings/Python/ Makefile. in: Don't build with --quiet, call install
with --install-layout= deb. - 39. By Luke Yelavich
-
* Merge from debian unstable, remaining changes:
- Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev.
- Add brltty-setup, installed in both the udeb and the normal system.
- Add initramfs integration to run brltty-setup if necessary before
usplash starts.
- Add ubiquity integration to propagate any brltty configuration to the
target system.
- Add udev rules and /lib/brltty/brltty. sh to the normal (non-udeb)
package as well.
- Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set
by the installer if brltty is configured; add a NEWS entry for
upgraders.
- Install udev rules with the same name (85-brltty.rules) in the udeb as
in the deb.
- Only copy the brltty config file from the initramfs if the md5sum differs.
- Change maintainer to Ubuntu Accessibility Developers
<email address hidden>
- Disable BrlTTY grabbing devices that use the FTDI USB to serial chip.
- Remove the dh-lisp build-dependency, remove the cl-brlapi package, and
adjust the brltty package description accordingly. dh-lisp is not
in main.
- Do not build the speechd package, speech-dispatcher is not in main.
- Build for python 2.6.
- Build against openjdk in Ubuntu.
- Put udev rules file in /lib/udev/rules.d.
- Enable brltty at startup on the target system if the alternate installer
is used. - 37. By Luke Yelavich
-
* debian/brltty.init: Only replace brltty.conf if the md5sum of the existing
file is the same as what was shipped with the package.
* debian/rules: Put the md5sum of brltty.conf into the newly installed init
file.
* debian/brltty- udeb.prebasecon fig: Enable BrlTTY at startup on the target
system. (LP: #299989)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/lucid/brltty