Bug#1063524: brltty: move aliased files to /usr (DEP17)

2024-02-18 Thread Samuel Thibault 
Helmut Grohne, le dim. 18 févr. 2024 07:45:17 +0100, a ecrit:
> > > diff --minimal -Nru brltty-6.6/debian/brltty-udeb.dirs 
> > > brltty-6.6/debian/brltty-udeb.dirs
> > > --- brltty-6.6/debian/brltty-udeb.dirs2021-01-28 17:18:34.0 
> > > +0100
> > > +++ brltty-6.6/debian/brltty-udeb.dirs2024-02-08 17:59:12.0 
> > > +0100
> > > @@ -1,7 +1,7 @@
> > > -lib/debian-installer.d
> > > -lib/debian-installer-startup.d
> > > +usr/lib/debian-installer.d
> > > +usr/lib/debian-installer-startup.d
> > 
> > These are not currently read by the debian installer, so we mustn't move
> > these files for now.
> 
> I have moved such files elsewhere, so if this really causes problems
> still, I'd like to learn soon and handle it.

I have now tested it completely, it seems to be going fine indeed.

Samuel

Bug#1063524: brltty: move aliased files to /usr (DEP17)

2024-02-18 Thread Samuel Thibault 
Helmut Grohne, le dim. 18 févr. 2024 07:45:17 +0100, a ecrit:
> > > diff --minimal -Nru brltty-6.6/debian/brltty-udeb.dirs 
> > > brltty-6.6/debian/brltty-udeb.dirs
> > > --- brltty-6.6/debian/brltty-udeb.dirs2021-01-28 17:18:34.0 
> > > +0100
> > > +++ brltty-6.6/debian/brltty-udeb.dirs2024-02-08 17:59:12.0 
> > > +0100
> > > @@ -1,7 +1,7 @@
> > > -lib/debian-installer.d
> > > -lib/debian-installer-startup.d
> > > +usr/lib/debian-installer.d
> > > +usr/lib/debian-installer-startup.d
> > 
> > These are not currently read by the debian installer, so we mustn't move
> > these files for now.
> 
> Keep in mind that the installer has been /usr-merged.

Oh, it has? I didn't know that.

Samuel

Bug#1063524: brltty: move aliased files to /usr (DEP17)

2024-02-17 Thread Helmut Grohne 
Hi Samuel,

On Sat, Feb 17, 2024 at 11:09:36PM +0100, Samuel Thibault wrote:
> Yes, we very often backport brltty, so I'll follow that road for now.
> I'll upload a patched package to experimental for users to check.

Yes, please.

> > diff --minimal -Nru brltty-6.6/debian/brltty-udeb.dirs 
> > brltty-6.6/debian/brltty-udeb.dirs
> > --- brltty-6.6/debian/brltty-udeb.dirs  2021-01-28 17:18:34.0 
> > +0100
> > +++ brltty-6.6/debian/brltty-udeb.dirs  2024-02-08 17:59:12.0 
> > +0100
> > @@ -1,7 +1,7 @@
> > -lib/debian-installer.d
> > -lib/debian-installer-startup.d
> > +usr/lib/debian-installer.d
> > +usr/lib/debian-installer-startup.d
> 
> These are not currently read by the debian installer, so we mustn't move
> these files for now.

Keep in mind that the installer has been /usr-merged. /lib will be a
symbolic link to usr/lib, so as long as you go via the filesystem, such
accesses should work and this is aspect no longer is a concern. I have
moved such files elsewhere, so if this really causes problems still, I'd
like to learn soon and handle it.

Helmut

Bug#1063524: brltty: move aliased files to /usr (DEP17)

2024-02-17 Thread Samuel Thibault 
Hello,

Helmut Grohne, le ven. 09 févr. 2024 07:25:07 +0100, a ecrit:
> If you wish to continue backporting, you may defer applying this patch
> or add a manual dh_movetousr call before dh_installdeb.

Yes, we very often backport brltty, so I'll follow that road for now.
I'll upload a patched package to experimental for users to check.

> diff --minimal -Nru brltty-6.6/debian/brltty-udeb.dirs 
> brltty-6.6/debian/brltty-udeb.dirs
> --- brltty-6.6/debian/brltty-udeb.dirs2021-01-28 17:18:34.0 
> +0100
> +++ brltty-6.6/debian/brltty-udeb.dirs2024-02-08 17:59:12.0 
> +0100
> @@ -1,7 +1,7 @@
> -lib/debian-installer.d
> -lib/debian-installer-startup.d
> +usr/lib/debian-installer.d
> +usr/lib/debian-installer-startup.d

These are not currently read by the debian installer, so we mustn't move
these files for now.

Samuel

Bug#1063524: brltty: move aliased files to /usr (DEP17)

2024-02-09 Thread Helmut Grohne 
Source: brltty
Version: 6.6-4
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Hi,

we want to finalize the /usr-merge transition by moving all files to
/usr via DEP17 and thus remove practical problems arising from aliasing.
brltty is involved, because it installs various files in aliased
locations and it cannot be moved by enabling the dh-sequence-movetousr
addon as it does not use dh. In order to move this forward efficiently,
I have prepared a patch to manually perform the move. Note that this
patch must not be uploaded to bookworm-backports or earlier. If you wish
to continue backporting, you may defer applying this patch or add a
manual dh_movetousr call before dh_installdeb. Please ensure that files
are moved before trixie's toolchain freeze though.

Helmut
diff --minimal -Nru brltty-6.6/debian/brltty-espeak.dirs 
brltty-6.6/debian/brltty-espeak.dirs
--- brltty-6.6/debian/brltty-espeak.dirs2021-01-28 17:18:34.0 
+0100
+++ brltty-6.6/debian/brltty-espeak.dirs2024-02-08 17:59:12.0 
+0100
@@ -1,2 +1,2 @@
-lib/brltty
+usr/lib/brltty
 
diff --minimal -Nru brltty-6.6/debian/brltty-flite.dirs 
brltty-6.6/debian/brltty-flite.dirs
--- brltty-6.6/debian/brltty-flite.dirs 2021-01-28 17:18:34.0 +0100
+++ brltty-6.6/debian/brltty-flite.dirs 2024-02-08 17:59:12.0 +0100
@@ -1,2 +1,2 @@
-lib/brltty
+usr/lib/brltty
 
diff --minimal -Nru brltty-6.6/debian/brltty-speechd.dirs 
brltty-6.6/debian/brltty-speechd.dirs
--- brltty-6.6/debian/brltty-speechd.dirs   2021-01-28 17:18:34.0 
+0100
+++ brltty-6.6/debian/brltty-speechd.dirs   2024-02-08 17:59:12.0 
+0100
@@ -1,2 +1,2 @@
-lib/brltty
+usr/lib/brltty
 
diff --minimal -Nru brltty-6.6/debian/brltty-udeb.dirs 
brltty-6.6/debian/brltty-udeb.dirs
--- brltty-6.6/debian/brltty-udeb.dirs  2021-01-28 17:18:34.0 +0100
+++ brltty-6.6/debian/brltty-udeb.dirs  2024-02-08 17:59:12.0 +0100
@@ -1,7 +1,7 @@
 etc/brltty
-lib/udev/rules.d
-lib/brltty
-lib/debian-installer.d
-lib/debian-installer-startup.d
-lib/udev
+usr/lib/udev/rules.d
+usr/lib/brltty
+usr/lib/debian-installer.d
+usr/lib/debian-installer-startup.d
+usr/lib/udev
 usr/lib/finish-install.d
diff --minimal -Nru brltty-6.6/debian/brltty-x11.dirs 
brltty-6.6/debian/brltty-x11.dirs
--- brltty-6.6/debian/brltty-x11.dirs   2021-01-28 17:18:34.0 +0100
+++ brltty-6.6/debian/brltty-x11.dirs   2024-02-08 17:59:12.0 +0100
@@ -1,2 +1,2 @@
 etc/brltty
-lib/brltty
+usr/lib/brltty
diff --minimal -Nru brltty-6.6/debian/brltty.dirs brltty-6.6/debian/brltty.dirs
--- brltty-6.6/debian/brltty.dirs   2021-01-28 17:18:34.0 +0100
+++ brltty-6.6/debian/brltty.dirs   2024-02-08 17:59:12.0 +0100
@@ -1,4 +1,4 @@
 etc/brltty
-lib/brltty
+usr/lib/brltty
 usr/share/initramfs-tools/hooks
 usr/share/initramfs-tools/scripts/init-premount
diff --minimal -Nru brltty-6.6/debian/brltty.install 
brltty-6.6/debian/brltty.install
--- brltty-6.6/debian/brltty.install2022-06-18 09:31:08.0 +0200
+++ brltty-6.6/debian/brltty.install2024-02-08 17:59:12.0 +0100
@@ -1,18 +1,18 @@
 debian/tmp/etc/brltty etc
-debian/tmp/bin/brltty bin
-debian/tmp/bin/eutp usr/bin
-debian/tmp/bin/vstp usr/bin
-debian/tmp/bin/brltty-atb usr/bin
-debian/tmp/bin/brltty-ctb usr/bin
-debian/tmp/bin/brltty-ktb usr/bin
-debian/tmp/bin/brltty-ttb usr/bin
-debian/tmp/bin/brltty-trtxt usr/bin
-debian/tmp/bin/brltty-clip usr/bin
-debian/tmp/bin/brltty-hid usr/bin
-debian/tmp/bin/brltty-lscmds usr/bin
-debian/tmp/bin/brltty-morse usr/bin
-debian/tmp/bin/brltty-tune usr/bin
-debian/tmp/lib/brltty lib
+debian/tmp/usr/bin/brltty usr/bin
+debian/tmp/usr/bin/eutp usr/bin
+debian/tmp/usr/bin/vstp usr/bin
+debian/tmp/usr/bin/brltty-atb usr/bin
+debian/tmp/usr/bin/brltty-ctb usr/bin
+debian/tmp/usr/bin/brltty-ktb usr/bin
+debian/tmp/usr/bin/brltty-ttb usr/bin
+debian/tmp/usr/bin/brltty-trtxt usr/bin
+debian/tmp/usr/bin/brltty-clip usr/bin
+debian/tmp/usr/bin/brltty-hid usr/bin
+debian/tmp/usr/bin/brltty-lscmds usr/bin
+debian/tmp/usr/bin/brltty-morse usr/bin
+debian/tmp/usr/bin/brltty-tune usr/bin
+debian/tmp/usr/lib/brltty usr/lib
 debian/tmp/usr/share/locale
 debian/initramfs/hooks/brltty usr/share/initramfs-tools/hooks
 debian/initramfs/scripts/init-premount/brltty 
usr/share/initramfs-tools/scripts/init-premount
diff --minimal -Nru brltty-6.6/debian/brltty.links 
brltty-6.6/debian/brltty.links
--- brltty-6.6/debian/brltty.links  2021-01-28 17:18:34.0 +0100
+++ brltty-6.6/debian/brltty.links  2024-02-08 17:59:12.0 +0100
@@ -1 +1 @@
-/bin/brltty /sbin/brltty
+/usr/bin/brltty /usr/sbin/brltty
diff --minimal -Nru brltty-6.6/debian/changelog brltty-6.6/debian/changelog
--- brltty-6.6/debian/changelog 2023-09-05 00:11:56.0 +0200
+++ brltty-6.6/debian/changelog 2024-02-08 17:59:12.0 +0100
@@ -1,3 +1,10 @@
+brltty (6.6-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * DEP17: Move files to /usr.