Mismerged 6.5-5ubuntu1 not installable
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
brltty (Ubuntu) |
Fix Released
|
Critical
|
William Wilson |
Bug Description
See https:/
diff -Nru brltty-
--- brltty-
+++ brltty-
@@ -2,6 +2,7 @@
set -e
+<<<<<<< brltty-6.5-3ubuntu2 (ubuntu)
if [ ! -e /etc/brlapi.key ]; then
mcookie >/etc/brlapi.key
chmod 0640 /etc/brlapi.key
@@ -12,6 +13,25 @@
fi
#update-rc.d brltty start 10 23 . > /dev/null
+=======
+case "${1:-}" in
+ configure|
+
+ if [ ! -e /etc/brlapi.key ]; then
+ mcookie >/etc/brlapi.key
+ chmod 0640 /etc/brlapi.key
+ fi
+
+ [ -r /etc/default/brltty ] && . /etc/default/brltty
+
+ ! [ "$START_
+ ! command -v update-initramfs >/dev/null 2>&1 || update-initramfs -u
+
+ #update-rc.d brltty start 10 23 . > /dev/null
+
+ ;;
+esac
+>>>>>>> brltty-6.5-5 (debian)
#DEBHELPER#
Changed in brltty (Ubuntu): | |
status: | Triaged → Fix Released |