Mismerged 6.5-5ubuntu1 not installable

Bug #1997668 reported by Rico Tzschichholz
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
brltty (Ubuntu)
Fix Released
Critical
William Wilson

Bug Description

See https://launchpadlibrarian.net/635591887/brltty_6.5-3ubuntu2_6.5-5ubuntu1.diff.gz

diff -Nru brltty-6.5/debian/brltty.postinst brltty-6.5/debian/brltty.postinst
--- brltty-6.5/debian/brltty.postinst 2022-06-12 21:14:11.000000000 +0000
+++ brltty-6.5/debian/brltty.postinst 2022-11-12 16:21:56.000000000 +0000
@@ -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|reconfigure)
+
+ if [ ! -e /etc/brlapi.key ]; then
+ mcookie >/etc/brlapi.key
+ chmod 0640 /etc/brlapi.key
+ fi
+
+ [ -r /etc/default/brltty ] && . /etc/default/brltty
+
+ ! [ "$START_IN_INITRAMFS" = "true" -o "$START_IN_INITRAMFS" = "yes" ] || \
+ ! 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
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.