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.dirs 2021-01-28 17:18:34.000000000
+0100
+++ brltty-6.6/debian/brltty-espeak.dirs 2024-02-08 17:59:12.000000000
+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.000000000 +0100
+++ brltty-6.6/debian/brltty-flite.dirs 2024-02-08 17:59:12.000000000 +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.000000000
+0100
+++ brltty-6.6/debian/brltty-speechd.dirs 2024-02-08 17:59:12.000000000
+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.000000000 +0100
+++ brltty-6.6/debian/brltty-udeb.dirs 2024-02-08 17:59:12.000000000 +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.000000000 +0100
+++ brltty-6.6/debian/brltty-x11.dirs 2024-02-08 17:59:12.000000000 +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.000000000 +0100
+++ brltty-6.6/debian/brltty.dirs 2024-02-08 17:59:12.000000000 +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.install 2022-06-18 09:31:08.000000000 +0200
+++ brltty-6.6/debian/brltty.install 2024-02-08 17:59:12.000000000 +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.000000000 +0100
+++ brltty-6.6/debian/brltty.links 2024-02-08 17:59:12.000000000 +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.000000000 +0200
+++ brltty-6.6/debian/changelog 2024-02-08 17:59:12.000000000 +0100
@@ -1,3 +1,10 @@
+brltty (6.6-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 08 Feb 2024 17:59:12 +0100
+
brltty (6.6-4) unstable; urgency=high
* patches/git-base-none-quality: Set quality to low or none for base and no
diff --minimal -Nru brltty-6.6/debian/libbrlapi-dev.install
brltty-6.6/debian/libbrlapi-dev.install
--- brltty-6.6/debian/libbrlapi-dev.install 2021-01-28 17:18:34.000000000
+0100
+++ brltty-6.6/debian/libbrlapi-dev.install 2024-02-08 17:59:12.000000000
+0100
@@ -1,4 +1,5 @@
debian/tmp/usr/lib/*/libbrlapi*.a
+debian/tmp/usr/lib/*/libbrlapi*.so
debian/tmp/usr/include/brlapi*
debian/tmp/usr/include/brltty/api.h
debian/tmp/usr/include/brltty/brldefs*
diff --minimal -Nru brltty-6.6/debian/libbrlapi0.8.install
brltty-6.6/debian/libbrlapi0.8.install
--- brltty-6.6/debian/libbrlapi0.8.install 2021-09-20 23:28:25.000000000
+0200
+++ brltty-6.6/debian/libbrlapi0.8.install 2024-02-08 17:59:12.000000000
+0100
@@ -1 +1 @@
-debian/tmp/lib/*/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
diff --minimal -Nru brltty-6.6/debian/rules brltty-6.6/debian/rules
--- brltty-6.6/debian/rules 2023-09-05 00:08:51.000000000 +0200
+++ brltty-6.6/debian/rules 2024-02-08 17:59:12.000000000 +0100
@@ -22,6 +22,7 @@
HARDENING = CPPFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all
dpkg-buildflags --get CPPFLAGS)"
CFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get
CFLAGS)" CXXFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags
--get CXXFLAGS)" LDFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all
dpkg-buildflags --get LDFLAGS)"
CONFIGURE_OPTIONS = --mandir=/usr/share/man \
+ --exec-prefix=/usr \
--without-theta --without-swift \
JAVA_JNI_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/jni
@@ -165,12 +166,9 @@
$(MAKE) -C build-py$$pyver/Bindings/Python install
INSTALL_ROOT=`pwd`/debian/tmp V=1 ; \
done
- mkdir -p `pwd`/debian/tmp/lib/$(DEB_HOST_MULTIARCH)
mkdir -p `pwd`/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
- mv `pwd`/debian/tmp/lib/libbrlapi*
`pwd`/debian/tmp/lib/$(DEB_HOST_MULTIARCH)
- rm -f `pwd`/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libbrlapi.so
- test -f
`pwd`/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libbrlapi.so.$(BRLAPI_VERSION)
- mv `pwd`/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libbrlapi.a
`pwd`/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+ mv `pwd`/debian/tmp/usr/lib/libbrlapi*
`pwd`/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+ test -f
`pwd`/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libbrlapi.so.$(BRLAPI_VERSION)
sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' <
debian/initramfs/hooks/brltty.in > debian/initramfs/hooks/brltty
# Does not work anyway
rm -fr build-brltty/Bindings/Java/doc/jquery
@@ -190,23 +188,23 @@
dh_installman
dh_lintian
dh_python3 -ppython3-brlapi
- mv debian/brltty/lib/brltty/libbrlttysfl.so \
- debian/brltty-flite/lib/brltty
- mv debian/brltty/lib/brltty/libbrlttyssd.so \
- debian/brltty-speechd/lib/brltty
- mv debian/brltty/lib/brltty/libbrlttyses.so \
- debian/brltty-espeak/lib/brltty
- mv debian/brltty/lib/brltty/libbrlttysen.so \
- debian/brltty-espeak/lib/brltty
- mv debian/brltty/lib/brltty/libbrlttybxw.so \
- debian/brltty-x11/lib/brltty
+ mv debian/brltty/usr/lib/brltty/libbrlttysfl.so \
+ debian/brltty-flite/usr/lib/brltty
+ mv debian/brltty/usr/lib/brltty/libbrlttyssd.so \
+ debian/brltty-speechd/usr/lib/brltty
+ mv debian/brltty/usr/lib/brltty/libbrlttyses.so \
+ debian/brltty-espeak/usr/lib/brltty
+ mv debian/brltty/usr/lib/brltty/libbrlttysen.so \
+ debian/brltty-espeak/usr/lib/brltty
+ mv debian/brltty/usr/lib/brltty/libbrlttybxw.so \
+ debian/brltty-x11/usr/lib/brltty
mkdir -p debian/brltty-x11/etc/brltty/Input/xw
mv debian/brltty/etc/brltty/Input/xw/all.txt \
debian/brltty-x11/etc/brltty/Input/xw
mv debian/brltty/usr/share/doc/brltty/XWindow.README \
debian/brltty-x11/usr/share/doc/brltty-x11/
- mv debian/brltty/lib/brltty/libbrlttyxa2.so \
- debian/brltty-x11/lib/brltty
+ mv debian/brltty/usr/lib/brltty/libbrlttyxa2.so \
+ debian/brltty-x11/usr/lib/brltty
ifneq ($(DISABLE_JAVA_SUPPORT),1)
mv debian/tmp/usr/share/java/brlapi.jar \
debian/libbrlapi-java/usr/share/java
@@ -214,7 +212,6 @@
endif
cp build-brltty/Documents/brltty.conf debian/brltty/etc/brltty.conf
dh_link -p$@ -plibbrlapi$(BRLAPI_VERSION) -plibbrlapi-dev
- dh_link -plibbrlapi-dev
/lib/$(DEB_HOST_MULTIARCH)/libbrlapi.so.$(BRLAPI_VERSION)
/usr/lib/$(DEB_HOST_MULTIARCH)/libbrlapi.so
dh_strip_nondeterminism -a -i -Nbrltty-udeb
dh_strip -a
dh_compress
@@ -241,7 +238,7 @@
cp debian/brltty-udeb.prebaseconfig
debian/brltty-udeb/usr/lib/finish-install.d/07brltty
chmod 0755 debian/brltty-udeb/usr/lib/finish-install.d/07brltty
- cp debian/brltty-udeb.start
debian/brltty-udeb/lib/debian-installer.d/S19brltty
+ cp debian/brltty-udeb.start
debian/brltty-udeb/usr/lib/debian-installer.d/S19brltty
rm -f debian/brltty-udeb/bin/brltty-*
rm -Rf debian/brltty-udeb/usr/share
# Strip comments and whitespaces from translation tables
@@ -254,14 +251,14 @@
# It is sad, but help files are not really essential, but they are
# fairly large.
rm debian/brltty-udeb/etc/brltty/Input/*/*.txt
- #rm -Rf debian/brltty-udeb/lib
- cp debian/brltty-udeb.init
debian/$@/lib/debian-installer-startup.d/S37brltty
- chmod +x debian/$@/lib/debian-installer-startup.d/S37brltty
- cp debian/brltty-udeb.udev.rules debian/$@/lib/udev/rules.d/brltty.rules
- cp debian/brltty-udeb.udev.sh debian/$@/lib/udev/brltty.sh
- chmod +x debian/$@/lib/udev/brltty.sh
- cp debian/brltty-udeb.sh debian/$@/lib/brltty/brltty.sh
- chmod +x debian/$@/lib/brltty/brltty.sh
+ #rm -Rf debian/brltty-udeb/usr/lib
+ cp debian/brltty-udeb.init
debian/$@/usr/lib/debian-installer-startup.d/S37brltty
+ chmod +x debian/$@/usr/lib/debian-installer-startup.d/S37brltty
+ cp debian/brltty-udeb.udev.rules
debian/$@/usr/lib/udev/rules.d/brltty.rules
+ cp debian/brltty-udeb.udev.sh debian/$@/usr/lib/udev/brltty.sh
+ chmod +x debian/$@/usr/lib/udev/brltty.sh
+ cp debian/brltty-udeb.sh debian/$@/usr/lib/brltty/brltty.sh
+ chmod +x debian/$@/usr/lib/brltty/brltty.sh
mkdir -p debian/$@/usr/share/brltty-udeb
cp debian/mate-preseed.cfg
debian/$@/usr/share/brltty-udeb/mate-preseed.cfg
dh_strip_nondeterminism -p$@
diff --minimal -Nru brltty-6.6/debian/xbrlapi.install
brltty-6.6/debian/xbrlapi.install
--- brltty-6.6/debian/xbrlapi.install 2021-01-28 17:18:34.000000000 +0100
+++ brltty-6.6/debian/xbrlapi.install 2024-02-08 17:59:12.000000000 +0100
@@ -1,3 +1,3 @@
-debian/tmp/bin/xbrlapi usr/bin
+debian/tmp/usr/bin/xbrlapi usr/bin
debian/tmp/etc/X11/Xsession.d
debian/tmp/usr/share/gdm/greeter/autostart
