[Bug 1997668] [NEW] Mismerged 6.5-5ubuntu1 not installable

[Rico Tzschichholz]

Public bug reported:

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#

** Affects: brltty (Ubuntu)
     Importance: Critical
     Assignee: William Wilson (jawn-smith)
         Status: Triaged


** Tags: block-proposed

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to brltty in Ubuntu.
https://bugs.launchpad.net/bugs/1997668

Title:
  Mismerged 6.5-5ubuntu1 not installable

Status in brltty package in Ubuntu:
  Triaged

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#

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/brltty/+bug/1997668/+subscriptions