Bug#1059416: osspd: install files into /usr (instead of /)
Source: osspd
Version: 1.3.2-13.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi!
Your package installs files into /lib/{udev,modules-load.d}.
For the ongoing Debian UsrMerge effort [1] these files should move
to /usr in the trixie cycle.
I'm attaching a patch to implement such a move.
However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru osspd-1.3.2/debian/changelog osspd-1.3.2/debian/changelog
--- osspd-1.3.2/debian/changelog 2023-02-04 19:49:50.0 +0100
+++ osspd-1.3.2/debian/changelog 2023-12-24 22:18:57.0 +0100
@@ -1,3 +1,12 @@
+osspd (1.3.2-13.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install all files below /usr. (Closes: #-1)
+For udev rules, use udev.pc to find correct install location.
+For the rest, just hardcode /usr.
+
+ -- Chris Hofstaedtler Sun, 24 Dec 2023 22:18:57 +0100
+
osspd (1.3.2-13.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru osspd-1.3.2/debian/control osspd-1.3.2/debian/control
--- osspd-1.3.2/debian/control 2023-02-04 19:49:50.0 +0100
+++ osspd-1.3.2/debian/control 2023-12-24 22:18:57.0 +0100
@@ -6,7 +6,9 @@
Build-Depends: debhelper-compat (= 13),
libasound2-dev,
libfuse-dev,
- libpulse-dev
+ libpulse-dev,
+ pkgconf,
+ systemd-dev
Standards-Version: 4.3.0
Homepage: https://sourceforge.net/projects/osspd/
Vcs-Browser: https://salsa.debian.org/debian/osspd
diff -Nru osspd-1.3.2/debian/osspd.install osspd-1.3.2/debian/osspd.install
--- osspd-1.3.2/debian/osspd.install 2023-02-04 19:49:50.0 +0100
+++ osspd-1.3.2/debian/osspd.install 2023-12-24 22:17:44.0 +0100
@@ -1,2 +1,2 @@
-lib/udev/rules.d/98-osscuse.rules
+${env:deb_udevdir}/rules.d/98-osscuse.rules
usr/sbin/osspd
diff -Nru osspd-1.3.2/debian/rules osspd-1.3.2/debian/rules
--- osspd-1.3.2/debian/rules 2023-02-04 19:49:50.0 +0100
+++ osspd-1.3.2/debian/rules 2023-12-24 22:18:10.0 +0100
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
SLAVESDIR=/usr/lib/osspd
-UDEVDIR=/lib/udev/rules.d
+UDEVDIR=/${deb_udevdir}/rules.d
%:
dh $@
@@ -18,7 +19,7 @@
override_dh_install:
dh_install
# adding kmod integration
- install -D -m 0644 debian/osspd.kmod debian/osspd/lib/modules-load.d/osspd.conf
+ install -D -m 0644 debian/osspd.kmod debian/osspd/usr/lib/modules-load.d/osspd.conf
# Disable tests, they require running the osspd
override_dh_auto_test:
Bug#1059415: ntfs-3g: install files into /usr (instead of /)
Source: ntfs-3g
Version: 1:2022.10.3-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi!
Your package installs files into /. For the ongoing Debian UsrMerge
effort [1] these files should move to /usr in the trixie cycle.
I'm attaching a patch to implement such a move. It is quite
involved, but mostly undoes the move /usr -> /. The upstream
Makefiles ignore --exec-prefix/rootsbindir for the mount.* symlinks,
so I've chosen to re-create them using dh_link instead.
However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru ntfs-3g-2022.10.3/debian/changelog ntfs-3g-2022.10.3/debian/changelog
--- ntfs-3g-2022.10.3/debian/changelog 2022-10-31 15:14:06.0 +0100
+++ ntfs-3g-2022.10.3/debian/changelog 2023-12-24 21:16:13.0 +0100
@@ -1,3 +1,10 @@
+ntfs-3g (1:2022.10.3-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install files into /usr instead of /. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 24 Dec 2023 21:16:13 +0100
+
ntfs-3g (1:2022.10.3-1) unstable; urgency=high
* New upstream release:
diff -Nru ntfs-3g-2022.10.3/debian/libntfs-3g89.install ntfs-3g-2022.10.3/debian/libntfs-3g89.install
--- ntfs-3g-2022.10.3/debian/libntfs-3g89.install 2015-10-24 09:41:03.0 +0200
+++ ntfs-3g-2022.10.3/debian/libntfs-3g89.install 2023-12-24 21:16:13.0 +0100
@@ -1 +1 @@
-lib/*/*.so.*
+usr/lib/*/*.so.*
diff -Nru ntfs-3g-2022.10.3/debian/local/ntfs-3g.hook ntfs-3g-2022.10.3/debian/local/ntfs-3g.hook
--- ntfs-3g-2022.10.3/debian/local/ntfs-3g.hook 2014-04-25 20:44:28.0 +0200
+++ ntfs-3g-2022.10.3/debian/local/ntfs-3g.hook 2023-12-24 21:16:13.0 +0100
@@ -17,9 +17,9 @@
. /usr/share/initramfs-tools/hook-functions
-copy_exec /bin/ntfs-3g /bin
+copy_exec /usr/bin/ntfs-3g /usr/bin
-ln -s /bin/ntfs-3g "${DESTDIR}/sbin/mount.ntfs-3g"
-ln -s /bin/ntfs-3g "${DESTDIR}/sbin/mount.ntfs"
+ln -s /usr/bin/ntfs-3g "${DESTDIR}/usr/sbin/mount.ntfs-3g"
+ln -s /usr/bin/ntfs-3g "${DESTDIR}/usr/sbin/mount.ntfs"
exit 0
diff -Nru ntfs-3g-2022.10.3/debian/ntfs-3g.install ntfs-3g-2022.10.3/debian/ntfs-3g.install
--- ntfs-3g-2022.10.3/debian/ntfs-3g.install 2015-10-24 09:40:42.0 +0200
+++ ntfs-3g-2022.10.3/debian/ntfs-3g.install 2023-12-24 21:16:13.0 +0100
@@ -1,4 +1,3 @@
-bin
-sbin
usr/bin
+usr/sbin
usr/share
diff -Nru ntfs-3g-2022.10.3/debian/ntfs-3g.links ntfs-3g-2022.10.3/debian/ntfs-3g.links
--- ntfs-3g-2022.10.3/debian/ntfs-3g.links 2014-04-25 20:44:28.0 +0200
+++ ntfs-3g-2022.10.3/debian/ntfs-3g.links 2023-12-24 21:16:13.0 +0100
@@ -1,4 +1,6 @@
-/sbin/mount.ntfs-3g /sbin/mount.ntfs
+/usr/sbin/mount.ntfs-3g /usr/sbin/mount.ntfs
+/usr/bin/ntfs-3g /usr/sbin/mount.ntfs-3g
+/usr/bin/lowntfs-3g /usr/sbin/mount.lowntfs-3g
/usr/share/man/man8/ntfs-3g.8.gz /usr/share/man/man8/mount.ntfs.8.gz
/usr/share/man/man8/ntfs-3g.8.gz /usr/share/man/man8/lowntfs-3g.8.gz
diff -Nru ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.install ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.install
--- ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.install 2015-10-24 09:42:19.0 +0200
+++ ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.install 2023-12-24 21:16:13.0 +0100
@@ -1,4 +1,3 @@
-bin/ntfs-3g
-lib/*/*.so.*
-sbin/mount.*
-sbin/ntfsresize
+usr/bin/ntfs-3g
+usr/lib/*/*.so.*
+usr/sbin/ntfsresize
diff -Nru ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.links ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.links
--- ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.links 2014-04-25 20:44:28.0 +0200
+++ ntfs-3g-2022.10.3/debian/ntfs-3g-udeb.links 2023-12-24 21:16:13.0 +0100
@@ -1 +1,2 @@
-/sbin/mount.ntfs-3g /sbin/mount.ntfs
+/usr/sbin/mount.ntfs-3g /usr/sbin/mount.ntfs
+/usr/bin/ntfs-3g /usr/sbin/mount.ntfs-3g
diff -Nru ntfs-3g-2022.10.3/debian/rules ntfs-3g-2022.10.3/debian/rules
--- ntfs-3g-2022.10.3/debian/rules 2022-10-31 15:14:06.0 +0100
+++ ntfs-3g-2022.10.3/debian/rules 2023-12-24 21:16:13.0 +0100
@@ -11,7 +11,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-SONAME = $(shell objdump -p debian/tmp/lib/*/libntfs-3g.so.*.* | awk -Fso. '/SONAME/ { print $$2 }')
+SONAME = $(shell objdump -p debian/tmp/usr/lib/*/libntfs-3g.so.*.* | awk -Fso. '/SONAME/ { print $$2 }')
ifeq ($(DEB_HOST_ARCH_OS), linux)
CONFIGURE_FLAGS = --enable-posix-acls
@@ -24,7 +24,7 @@
dh ${@}
override_dh_auto_configure:
- dh_auto_configure -- --exec-prefix=/ --enable-crypto \
+ dh_auto_configure -- --exec-prefix=/usr --enable-crypto \
--enable-extras --enable-xattr-mappings \
--enable-quarantined --disable-ldconfig \
--enable-mount-hel
Bug#1059414: open-ath9k-htc-firmware: install files into /usr (instead of /)
Source: open-ath9k-htc-firmware Version: 1.4.0-108-gd856466+dfsg1-1.4 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs firmware files into /lib/firmware. For the ongoing Debian UsrMerge effort [1] these files should move to /usr/lib/firmware in the trixie cycle. I'm attaching a very trivial patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog --- open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog 2023-07-26 21:09:48.0 +0200 +++ open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog 2023-12-24 21:24:56.0 +0100 @@ -1,3 +1,10 @@ +open-ath9k-htc-firmware (1.4.0-108-gd856466+dfsg1-1.5) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install all files below /usr. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 24 Dec 2023 21:24:56 +0100 + open-ath9k-htc-firmware (1.4.0-108-gd856466+dfsg1-1.4) unstable; urgency=medium * Non-maintainer upload. diff -Nru open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install --- open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install 2023-07-26 21:09:18.0 +0200 +++ open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install 2023-12-24 21:24:52.0 +0100 @@ -1,2 +1,2 @@ -target_firmware/htc_*.fw lib/firmware/ath9k_htc/ +target_firmware/htc_*.fw usr/lib/firmware/ath9k_htc/ debian/firmware-ath9k-htc.metainfo.xml usr/share/metainfo
Bug#1058828: thunderbolt-tools: diff for NMU version 0.9.3-6.1
Control: tags 1058828 + pending Dear maintainer, I've prepared an NMU for thunderbolt-tools (versioned as 0.9.3-6.1) and uploaded it to DELAYED/7. Please feel free to upload yourself in the meantime. Chris diff -Nru thunderbolt-tools-0.9.3/debian/changelog thunderbolt-tools-0.9.3/debian/changelog --- thunderbolt-tools-0.9.3/debian/changelog 2022-12-14 13:42:55.0 +0100 +++ thunderbolt-tools-0.9.3/debian/changelog 2023-12-24 14:13:22.0 +0100 @@ -1,3 +1,10 @@ +thunderbolt-tools (0.9.3-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * Skip duplicate installation of tbtacl-write. (Closes: #1058828) + + -- Chris Hofstaedtler Sun, 24 Dec 2023 14:13:22 +0100 + thunderbolt-tools (0.9.3-6) unstable; urgency=medium * Roll in all fixes since 0.9.3, project is now in maintainence diff -Nru thunderbolt-tools-0.9.3/debian/install thunderbolt-tools-0.9.3/debian/install --- thunderbolt-tools-0.9.3/debian/install 2018-04-08 16:43:12.0 +0200 +++ thunderbolt-tools-0.9.3/debian/install 2023-12-24 14:13:14.0 +0100 @@ -1,2 +1 @@ -build_userspace/tbtacl/tbtacl-write lib/udev/ build_userspace/tbtadm/tbtadm usr/bin
Bug#1059412: netcat-openbsd: install into /usr/bin
Source: netcat-openbsd Version: 1.226-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs nc.openbsd into /bin. For the ongoing Debian UsrMerge effort [1] it should move to /usr/bin in the trixie cycle. I'm attaching a patch to implement such a move. As noted in debian/changelog, the update-alternatives calls are intentionally kept unchanged, to preserve existing user configuration. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru netcat-openbsd-1.226/debian/changelog netcat-openbsd-1.226/debian/changelog --- netcat-openbsd-1.226/debian/changelog 2023-10-16 19:31:08.0 +0200 +++ netcat-openbsd-1.226/debian/changelog 2023-12-24 20:41:47.0 +0100 @@ -1,3 +1,12 @@ +netcat-openbsd (1.226-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install nc.openbsd into /usr/bin. (Closes: #-1) +Keep update-alternatives calls unchanged to preserve user +configuration. + + -- Chris Hofstaedtler Sun, 24 Dec 2023 20:41:47 +0100 + netcat-openbsd (1.226-1) unstable; urgency=medium [ Guilhem Moulin ] diff -Nru netcat-openbsd-1.226/debian/netcat-openbsd.install netcat-openbsd-1.226/debian/netcat-openbsd.install --- netcat-openbsd-1.226/debian/netcat-openbsd.install 2023-10-16 19:31:08.0 +0200 +++ netcat-openbsd-1.226/debian/netcat-openbsd.install 2023-12-24 20:41:19.0 +0100 @@ -1 +1 @@ -nc bin/ +nc usr/bin/ diff -Nru netcat-openbsd-1.226/debian/rules netcat-openbsd-1.226/debian/rules --- netcat-openbsd-1.226/debian/rules 2023-10-16 19:31:08.0 +0200 +++ netcat-openbsd-1.226/debian/rules 2023-12-24 20:41:33.0 +0100 @@ -39,7 +39,7 @@ endif execute_after_dh_install: - mv -T $(prefix)/bin/nc $(prefix)/bin/nc.openbsd + mv -T $(prefix)/usr/bin/nc $(prefix)/usr/bin/nc.openbsd execute_after_dh_installman: mv -T $(man1dir)/nc.1 $(man1dir)/nc_openbsd.1
Bug#1059411: nano: install files into /usr/bin
Source: nano Version: 7.2-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /bin. For the ongoing Debian UsrMerge effort [1] these files should move to /usr/bin in the trixie cycle. I'm attaching a patch to implement such a move. As noted in d/changelog, the update-alternatives calls are intentionally kept unchanged to preserve existing user configuration. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru nano-7.2/debian/changelog nano-7.2/debian/changelog --- nano-7.2/debian/changelog 2023-01-18 16:31:52.0 +0100 +++ nano-7.2/debian/changelog 2023-12-24 20:22:21.0 +0100 @@ -1,3 +1,12 @@ +nano (7.2-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install all files below /usr. (Closes: #-1) +Keep update-alternatives calls unchanged to preserve user +configuration. + + -- Chris Hofstaedtler Sun, 24 Dec 2023 20:22:21 +0100 + nano (7.2-1) unstable; urgency=medium * The "Blue checkmark" release. diff -Nru nano-7.2/debian/rules nano-7.2/debian/rules --- nano-7.2/debian/rules 2022-12-07 23:10:44.0 +0100 +++ nano-7.2/debian/rules 2023-12-24 20:22:21.0 +0100 @@ -13,8 +13,7 @@ tinybuild=$(CURDIR)/build-tiny udebbuild=$(CURDIR)/build-udeb -CONFFLAGS = \ - --bindir=/bin +CONFFLAGS = CONFFLAGS_nano = @@ -54,18 +53,18 @@ dh_auto_install --builddirectory=$(tinybuild) \ --destdir=$(CURDIR)/debian/nano-tiny - mv debian/nano-tiny/bin/nano debian/nano-tiny/bin/nano-tiny + mv debian/nano-tiny/usr/bin/nano debian/nano-tiny/usr/bin/nano-tiny rm -rf $(CURDIR)/debian/nano-tiny/usr/share/man rm -rf $(CURDIR)/debian/nano-tiny/usr/share/info rm -rf $(CURDIR)/debian/nano-tiny/usr/share/nano rm -rf $(CURDIR)/debian/nano-tiny/usr/share/doc/nano - rm -f $(CURDIR)/debian/nano-tiny/bin/rnano + rm -f $(CURDIR)/debian/nano-tiny/usr/bin/rnano ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES))) dh_auto_install --builddirectory=$(udebbuild) \ --destdir=$(CURDIR)/debian/nano-udeb - rm -rf $(CURDIR)/debian/nano-udeb/usr - rm -f $(CURDIR)/debian/nano-udeb/bin/rnano + rm -rf $(CURDIR)/debian/nano-udeb/usr/share + rm -f $(CURDIR)/debian/nano-udeb/usr/bin/rnano endif override_dh_auto_clean:
Bug#1059409: net-tools: please apply usr-merged layout in unstable
Source: net-tools Version: 2.10-0.1 User: helm...@debian.org Usertags: dep17m2 Control: tags -1 + fixed-in-experimental Hi! net-tools in experimental already applied the usr-merged layout. Please make sure this reaches unstable. (This bug is also helpful for keeping track of the in-progress work.) Thanks, Chris
Bug#1059408: mt-st: install files into /usr (instead of /)
Source: mt-st Version: 1.7-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru mt-st-1.7/debian/changelog mt-st-1.7/debian/changelog --- mt-st-1.7/debian/changelog 2023-04-20 23:30:00.0 +0200 +++ mt-st-1.7/debian/changelog 2023-12-24 20:14:47.0 +0100 @@ -1,3 +1,11 @@ +mt-st (1.7-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install all files below /usr, and update references to these files. +(Closes: #-1) + + -- Chris Hofstaedtler Sun, 24 Dec 2023 20:14:47 +0100 + mt-st (1.7-1) unstable; urgency=medium * New upstream release fixing a bug triggered by the test suite on diff -Nru mt-st-1.7/debian/mt-st.dirs mt-st-1.7/debian/mt-st.dirs --- mt-st-1.7/debian/mt-st.dirs 2023-04-20 23:30:00.0 +0200 +++ mt-st-1.7/debian/mt-st.dirs 1970-01-01 01:00:00.0 +0100 @@ -1,3 +0,0 @@ -sbin -bin -etc diff -Nru mt-st-1.7/debian/mt-st.files mt-st-1.7/debian/mt-st.files --- mt-st-1.7/debian/mt-st.files 2023-04-20 23:30:00.0 +0200 +++ mt-st-1.7/debian/mt-st.files 1970-01-01 01:00:00.0 +0100 @@ -1,4 +0,0 @@ -sbin/stinit -bin/mt-st -usr/share/man/man?/* -etc/stinit.def diff -Nru mt-st-1.7/debian/mt-st.udev mt-st-1.7/debian/mt-st.udev --- mt-st-1.7/debian/mt-st.udev 2023-04-20 23:30:00.0 +0200 +++ mt-st-1.7/debian/mt-st.udev 2023-12-24 20:13:53.0 +0100 @@ -1,3 +1,3 @@ # Use stinit to set default parameters on st device creation -KERNEL=="st[0-9]", RUN+="/sbin/stinit %n" -KERNEL=="st[0-9]*[0-9]", RUN+="/sbin/stinit %n" +KERNEL=="st[0-9]", RUN+="/usr/sbin/stinit %n" +KERNEL=="st[0-9]*[0-9]", RUN+="/usr/sbin/stinit %n" diff -Nru mt-st-1.7/debian/rules mt-st-1.7/debian/rules --- mt-st-1.7/debian/rules 2023-04-20 23:30:00.0 +0200 +++ mt-st-1.7/debian/rules 2023-12-24 20:14:47.0 +0100 @@ -9,9 +9,9 @@ dh $@ --with bash-completion override_dh_auto_install: - install -m 644 debian/stinit.def $(DESTDIR)/etc/ - install mt $(DESTDIR)/bin/mt-st - install stinit $(DESTDIR)/sbin/ + install -D -m 644 debian/stinit.def $(DESTDIR)/etc/stinit.def + install -D mt $(DESTDIR)/usr/bin/mt-st + install -D stinit $(DESTDIR)/usr/sbin/stinit override_dh_installman: cp mt.1 debian/mt-st.1 diff -Nru mt-st-1.7/debian/tests/simple mt-st-1.7/debian/tests/simple --- mt-st-1.7/debian/tests/simple 2023-04-20 23:30:00.0 +0200 +++ mt-st-1.7/debian/tests/simple 2023-12-24 20:14:07.0 +0100 @@ -11,8 +11,8 @@ # Symlink the installed binaries echo Symlinking the package binaries -ln -s /bin/mt-st "$AUTOPKGTEST_TMP/mt" -ln -s /sbin/stinit "$AUTOPKGTEST_TMP/stinit" +ln -s /usr/bin/mt-st "$AUTOPKGTEST_TMP/mt" +ln -s /usr/sbin/stinit "$AUTOPKGTEST_TMP/stinit" # And then run tests echo Running tests
Bug#1059407: mobile-tweaks: install udev, systemd files below /usr
Source: mobile-tweaks Version: 5 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files into /lib. For the ongoing Debian UsrMerge effort [1] these files should move to /usr/lib in the trixie cycle. I'm attaching a patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru mobile-tweaks-5/debian/changelog mobile-tweaks-5+nmu1/debian/changelog --- mobile-tweaks-5/debian/changelog 2023-07-18 14:59:15.0 +0200 +++ mobile-tweaks-5+nmu1/debian/changelog 2023-12-24 20:07:52.0 +0100 @@ -1,3 +1,10 @@ +mobile-tweaks (5+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install udev, systemd files below /usr. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 24 Dec 2023 20:07:52 +0100 + mobile-tweaks (5) unstable; urgency=medium [ undef ] diff -Nru mobile-tweaks-5/debian/control mobile-tweaks-5+nmu1/debian/control --- mobile-tweaks-5/debian/control 2022-02-03 07:43:11.0 +0100 +++ mobile-tweaks-5+nmu1/debian/control 2023-12-24 20:07:52.0 +0100 @@ -6,7 +6,8 @@ Arnaud Ferraris , Guido Günther , Henry-Nicolas Tourneur , -Build-Depends: debhelper-compat (= 13), +Build-Depends: debhelper (>= 13.11.6), + debhelper-compat (= 13), dh-exec Standards-Version: 4.5.0 Rules-Requires-Root: no diff -Nru mobile-tweaks-5/debian/librem5-tweaks.install mobile-tweaks-5+nmu1/debian/librem5-tweaks.install --- mobile-tweaks-5/debian/librem5-tweaks.install 2023-07-18 14:59:15.0 +0200 +++ mobile-tweaks-5+nmu1/debian/librem5-tweaks.install 2023-12-24 20:07:30.0 +0100 @@ -1,6 +1,6 @@ # GPSD -librem5/gpsd/99-gnss.rules lib/udev/rules.d/ -librem5/gpsd/gpsd.service.d lib/systemd/system/ +librem5/gpsd/99-gnss.rules usr/lib/udev/rules.d/ +librem5/gpsd/gpsd.service.d usr/lib/systemd/system/ librem5/gpsd/librem5-gpsd etc/default # Device specific gsettings for power management
Bug#1059405: lm-sensors: install fancontrol-systemd-sleep into /usr
Source: lm-sensors Version: 1:3.6.0-8 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs fancontrol-systemd-sleep into /lib/systemd/system-sleep. For the ongoing Debian UsrMerge effort [1] this should move below /usr during the trixie cycle. I'm attaching a patch to implement such a move, using systemd.pc to determine the correct location. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru lm-sensors-3.6.0/debian/changelog lm-sensors-3.6.0/debian/changelog --- lm-sensors-3.6.0/debian/changelog 2023-08-25 21:39:18.0 +0200 +++ lm-sensors-3.6.0/debian/changelog 2023-12-24 19:39:49.0 +0100 @@ -1,3 +1,10 @@ +lm-sensors (1:3.6.0-8.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use systemd.pc to place systemd sleep files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 24 Dec 2023 19:39:49 +0100 + lm-sensors (1:3.6.0-8) unstable; urgency=medium * Drop versioned depends on obsolete lsb-base package. diff -Nru lm-sensors-3.6.0/debian/control lm-sensors-3.6.0/debian/control --- lm-sensors-3.6.0/debian/control 2023-08-22 13:30:06.0 +0200 +++ lm-sensors-3.6.0/debian/control 2023-12-24 19:39:49.0 +0100 @@ -1,7 +1,7 @@ Source: lm-sensors Section: utils Priority: optional -Build-Depends: debhelper-compat (= 13), bison, flex +Build-Depends: debhelper-compat (= 13), bison, flex, pkgconf, systemd-dev Rules-Requires-Root: no Standards-Version: 4.6.2 Maintainer: Aurelien Jarno diff -Nru lm-sensors-3.6.0/debian/rules lm-sensors-3.6.0/debian/rules --- lm-sensors-3.6.0/debian/rules 2021-01-25 01:02:46.0 +0100 +++ lm-sensors-3.6.0/debian/rules 2023-12-24 19:39:49.0 +0100 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export deb_systemdsleepdir = $(shell pkg-config --variable=systemdsleepdir systemd) + %: dh $@ @@ -31,8 +33,7 @@ override_dh_auto_install-indep: $(MAKE) install-etc install-prog-pwm $(MAKEARGS_INDP) - mkdir -p $(CURDIR)/debian/fancontrol/lib/systemd/system-sleep/ - install -m 755 $(CURDIR)/debian/fancontrol-systemd-sleep $(CURDIR)/debian/fancontrol/lib/systemd/system-sleep/fancontrol + install -m 755 -D $(CURDIR)/debian/fancontrol-systemd-sleep $(CURDIR)/debian/fancontrol$(deb_systemdsleepdir)/fancontrol # Make sure /etc/sensors.d/ is not removed touch $(CURDIR)/debian/tmp/etc/sensors.d/.placeholder
Bug#1059404: lldpad: install systemd service into /usr
Source: lldpad Version: 1.1+git20221028.aa18720-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs systemd service files into /lib. For the ongoing Debian UsrMerge effort [1] these files should move to /usr/lib in the trixie cycle. I'm attaching a trivial patch to implement this move, mostly undoing the previous move to /lib. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru lldpad-1.1+git20221028.aa18720/debian/changelog lldpad-1.1+git20221028.aa18720/debian/changelog --- lldpad-1.1+git20221028.aa18720/debian/changelog 2023-02-19 22:47:00.0 +0100 +++ lldpad-1.1+git20221028.aa18720/debian/changelog 2023-12-24 19:32:18.0 +0100 @@ -1,3 +1,10 @@ +lldpad (1.1+git20221028.aa18720-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install systemd units into /usr (Closes: #-1) + + -- Chris Hofstaedtler Sun, 24 Dec 2023 19:32:18 +0100 + lldpad (1.1+git20221028.aa18720-1) unstable; urgency=medium * New upstream version 1.1+git20221028.aa18720 diff -Nru lldpad-1.1+git20221028.aa18720/debian/control lldpad-1.1+git20221028.aa18720/debian/control --- lldpad-1.1+git20221028.aa18720/debian/control 2023-02-19 22:28:23.0 +0100 +++ lldpad-1.1+git20221028.aa18720/debian/control 2023-12-24 19:31:45.0 +0100 @@ -7,6 +7,7 @@ Valentin Vidic , tony mancill Build-Depends: + debhelper (>= 13.11.6), debhelper-compat (= 13), pkg-config, libconfig-dev (>= 1.3.2~), diff -Nru lldpad-1.1+git20221028.aa18720/debian/lldpad.install lldpad-1.1+git20221028.aa18720/debian/lldpad.install --- lldpad-1.1+git20221028.aa18720/debian/lldpad.install 2020-02-17 19:37:25.0 +0100 +++ lldpad-1.1+git20221028.aa18720/debian/lldpad.install 2023-12-24 19:28:46.0 +0100 @@ -2,5 +2,5 @@ usr/sbin/* usr/lib/*/liblldp_clif.so.* etc/init.d/lldpad -lib/systemd/system/* +usr/lib/systemd/system/* usr/share/bash-completion/completions/* diff -Nru lldpad-1.1+git20221028.aa18720/debian/rules lldpad-1.1+git20221028.aa18720/debian/rules --- lldpad-1.1+git20221028.aa18720/debian/rules 2020-05-09 19:56:10.0 +0200 +++ lldpad-1.1+git20221028.aa18720/debian/rules 2023-12-24 19:28:39.0 +0100 @@ -17,8 +17,6 @@ override_dh_auto_install: dh_auto_install install -D lldpad.init debian/tmp/etc/init.d/lldpad - mkdir -p debian/tmp/lib/systemd - mv debian/tmp/usr/lib/systemd/system debian/tmp/lib/systemd override_dh_installinit: dh_installinit -plldpad --only-scripts
Bug#1059394: bridge-utils: install files into /usr (instead of /)
Source: bridge-utils
Version: 1.7.1-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi!
Your package installs files directly into /. For the ongoing Debian
UsrMerge effort [1] these files should move to /usr in the trixie
cycle.
I'm attaching a patch to implement such a move.
However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru bridge-utils-1.7.1/debian/bridge-network-interface.sh bridge-utils-1.7.1/debian/bridge-network-interface.sh
--- bridge-utils-1.7.1/debian/bridge-network-interface.sh 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/bridge-network-interface.sh 2023-12-23 21:31:44.0 +0100
@@ -19,7 +19,7 @@
[ "$BRIDGE_HOTPLUG" = "no" ] && exit 0
-. /lib/bridge-utils/bridge-utils.sh
+. /usr/lib/bridge-utils/bridge-utils.sh
if [ -d /run/network ]; then
for i in $(ifquery --list --allow auto); do
diff -Nru bridge-utils-1.7.1/debian/changelog bridge-utils-1.7.1/debian/changelog
--- bridge-utils-1.7.1/debian/changelog 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/changelog 2023-12-23 21:31:44.0 +0100
@@ -1,3 +1,10 @@
+bridge-utils (1.7.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install files into /usr instead of /. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 23 Dec 2023 21:31:44 +0100
+
bridge-utils (1.7.1-1) unstable; urgency=low
* New upstream version.
diff -Nru bridge-utils-1.7.1/debian/dirs bridge-utils-1.7.1/debian/dirs
--- bridge-utils-1.7.1/debian/dirs 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/dirs 2023-12-23 21:31:44.0 +0100
@@ -1,6 +1,6 @@
etc/network/if-pre-up.d
etc/network/if-down.d
etc/network/if-post-down.d
-sbin
-lib/bridge-utils
-lib/udev
+usr/sbin
+usr/lib/bridge-utils
+usr/lib/udev
diff -Nru bridge-utils-1.7.1/debian/examples/hibernate bridge-utils-1.7.1/debian/examples/hibernate
--- bridge-utils-1.7.1/debian/examples/hibernate 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/examples/hibernate 2023-12-23 21:31:44.0 +0100
@@ -6,7 +6,7 @@
AddConfigHandler BridgeOptions
BridgeSuspend() {
-for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i down
done
@@ -14,7 +14,7 @@
}
BridgeResume() {
-for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i up
done
diff -Nru bridge-utils-1.7.1/debian/examples/pm-utils bridge-utils-1.7.1/debian/examples/pm-utils
--- bridge-utils-1.7.1/debian/examples/pm-utils 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/examples/pm-utils 2023-12-23 21:31:44.0 +0100
@@ -4,7 +4,7 @@
# as /etc/pm/sleep.d/bridge
BridgeSuspend() {
-for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i down
done
@@ -12,7 +12,7 @@
}
BridgeResume() {
-for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i up
done
diff -Nru bridge-utils-1.7.1/debian/ifupdown.sh bridge-utils-1.7.1/debian/ifupdown.sh
--- bridge-utils-1.7.1/debian/ifupdown.sh 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/ifupdown.sh 2023-12-23 21:31:44.0 +0100
@@ -6,7 +6,7 @@
# Have a look at /usr/share/doc/bridge-utils/README.Debian if you want
# more info about the way on wich a bridge is set up on Debian.
-if [ ! -x /sbin/brctl ]
+if [ ! -x /usr/sbin/brctl ]
then
exit 0
fi
@@ -14,7 +14,7 @@
#default configuration
[ -f /etc/default/bridge-utils ] && . /etc/default/bridge-utils
-. /lib/bridge-utils/bridge-utils.sh
+. /usr/lib/bridge-utils/bridge-utils.sh
case "$IF_BRIDGE_PORTS" in
"")
diff -Nru bridge-utils-1.7.1/debian/rules bridge-utils-1.7.1/debian/rules
--- bridge-utils-1.7.1/debian/rules 2023-01-25 22:11:52.0 +0100
+++ bridge-utils-1.7.1/debian/rules 2023-12-23 21:31:44.0 +0100
@@ -64,13 +64,13 @@
# Add here commands to install the package into debian/tmp.
#$(MAKE) install prefix=$(CURDIR)/debian/bridge-utils/usr
- $(INSTALL_PROGRAM) -m 755 brctl/brctl $(IDIR)/sbin
- $(INSTALL_SCRIPT) -m 755 debian/ifupdown.sh $(IDIR)/lib/bridge-utils/
- ln -s /lib/br
Bug#1057240: alsa-utils: diff for NMU version 1.2.10-1.1
Control: tags 1057240 + patch
Control: tags 1057240 + pending
Dear maintainer,
I've prepared an NMU for alsa-utils (versioned as 1.2.10-1.1) and
uploaded it to DELAYED/7.
The NMU/patch also fixes the install path for systemd units and
moves the d-i script.
Chris
diff -Nru alsa-utils-1.2.10/debian/alsa-utils-udeb.install alsa-utils-1.2.10/debian/alsa-utils-udeb.install
--- alsa-utils-1.2.10/debian/alsa-utils-udeb.install 2019-10-30 11:35:09.0 +0100
+++ alsa-utils-1.2.10/debian/alsa-utils-udeb.install 2023-12-24 12:42:40.0 +0100
@@ -1,4 +1,4 @@
-debian/S37alsa-utils-udeb lib/debian-installer-startup.d
+debian/S37alsa-utils-udeb usr/lib/debian-installer-startup.d
debian/utils.sh /usr/share/alsa
usr/bin/amixer
usr/sbin/alsactl
diff -Nru alsa-utils-1.2.10/debian/changelog alsa-utils-1.2.10/debian/changelog
--- alsa-utils-1.2.10/debian/changelog 2023-09-13 15:45:59.0 +0200
+++ alsa-utils-1.2.10/debian/changelog 2023-12-24 12:42:40.0 +0100
@@ -1,3 +1,14 @@
+alsa-utils (1.2.10-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udevdir from udev.pc to determine udev rules install path.
+(Closes: #1057240)
+ * Use systemdsystemunitdir from systemd.pc to determine systemd unit install
+path.
+ * udeb: move debian-installer-startup.d/S37alsa-utils-udeb into /usr/lib.
+
+ -- Chris Hofstaedtler Sun, 24 Dec 2023 12:42:40 +0100
+
alsa-utils (1.2.10-1) unstable; urgency=medium
* New upstream release.
diff -Nru alsa-utils-1.2.10/debian/control alsa-utils-1.2.10/debian/control
--- alsa-utils-1.2.10/debian/control 2023-06-13 13:42:46.0 +0200
+++ alsa-utils-1.2.10/debian/control 2023-12-24 12:40:58.0 +0100
@@ -14,6 +14,7 @@
pkg-config,
python3-docutils,
systemd,
+ systemd-dev,
xmlto
Standards-Version: 4.6.2
Homepage: https://www.alsa-project.org/
diff -Nru alsa-utils-1.2.10/debian/install alsa-utils-1.2.10/debian/install
--- alsa-utils-1.2.10/debian/install 2022-07-06 03:17:35.0 +0200
+++ alsa-utils-1.2.10/debian/install 2023-12-24 12:42:40.0 +0100
@@ -1,6 +1,6 @@
debian/utils.sh /usr/share/alsa
-lib/systemd
-lib/udev
+${env:deb_systemdsystemunitdir}
+${env:deb_udevdir}/rules.d
usr/bin
usr/lib/*/alsa-topology/*.so
usr/sbin
diff -Nru alsa-utils-1.2.10/debian/links alsa-utils-1.2.10/debian/links
--- alsa-utils-1.2.10/debian/links 2019-10-30 11:35:09.0 +0100
+++ alsa-utils-1.2.10/debian/links 2023-12-24 12:42:40.0 +0100
@@ -1,3 +1,3 @@
-dev/null lib/systemd/system/alsa-utils.service
+dev/null ${env:deb_systemdsystemunitdir}/alsa-utils.service
usr/bin/aplay usr/bin/arecord
usr/share/man/man1/aplay.1.gz usr/share/man/man1/arecord.1.gz
diff -Nru alsa-utils-1.2.10/debian/rules alsa-utils-1.2.10/debian/rules
--- alsa-utils-1.2.10/debian/rules 2023-09-13 15:45:07.0 +0200
+++ alsa-utils-1.2.10/debian/rules 2023-12-24 12:41:31.0 +0100
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
%:
dh $@
@@ -10,7 +12,7 @@
--with-asound-state-dir=/var/lib/alsa \
--with-alsactl-home-dir=/run/alsa \
--with-alsactl-runtime-dir=/run/alsa/runtime \
- --with-systemdsystemunitdir=/lib/systemd/system \
+ --with-systemdsystemunitdir=/$(deb_systemdsystemunitdir) \
--disable-alsaconf
override_dh_auto_test:
Bug#1059187: samba: installs files into /lib/...
On Sun, Dec 24, 2023 at 12:54:09PM +0300, Michael Tokarev wrote: > Control: tag -1 + confirmed moreinfo > > 21.12.2023 03:09, Chris Hofstaedtler : > > For the correct place of the systemd system units, you can ask: > > pkg-config --variable=systemdsystemunitdir systemd > > Provided you add systemd-dev to Build-Depends. > > /lib/systemd is currently hard-coded in samba's d/rules (and repeated > in multiple places). It's easy to fix, but. > > The same samba package is being built on multiple distributions and > releases, including ubuntu focal and jammy, debian bullseye and buster, - > I provide sort of backports for these releases and this service has > become quite popular. The suggested > > pkg-config --variable=systemdsystemunitdir systemd > > does not work on bullseye already. This should work on bullseye, provided you Build-Depend: systemd. > What's an alternative way to determine if we should use /lib or /usr/lib > which works in older releases too - for systemd and for system libs like > libnss*? For systemd, please use systemd.pc. For everything else, it is harder: One option is to use dh_movetousr if available in debhelper, and otherwise skip it (= on old suites). For PAM, I'm guessing you can query libdir from pam.pc. Note that there is no coordinated plan for PAM yet, so while I hope pam.pc will, in the future, have a /usr/lib/... libdir, you cannot exactly rely on it. However, because the paths are aliased, if you move today it will still work. For nsswitch, I have no useful answer. Maybe piggyback on something else (pam?) even if that is technically wrong, or hardcode old suite names? Chris
Bug#896016: strace: please make the build reproducible
James Addison wrote: > Unfortunately there are plenty of FTBFS failures -- mostly test timeouts on > some architectures, alongside libfaketime errors that seem to affect i386 -- > but those seem like separate problems. Perhaps we could close this bug? Sure thing: as in, I agree that the FTBFS's are a separate problem and also that this bug can be closed. Can you go ahead and do so, presumably with the correct versioning? Many thanks. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#1059379: f2fs-tools: install files into /usr (instead of /)
Source: f2fs-tools Version: 1.16.0-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a trivial patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru f2fs-tools-1.16.0/debian/changelog f2fs-tools-1.16.0/debian/changelog --- f2fs-tools-1.16.0/debian/changelog 2023-07-17 06:03:45.0 +0200 +++ f2fs-tools-1.16.0/debian/changelog 2023-12-23 23:41:17.0 +0100 @@ -1,3 +1,10 @@ +f2fs-tools (1.16.0-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr instead of /. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 23 Dec 2023 23:41:17 +0100 + f2fs-tools (1.16.0-1) unstable; urgency=medium [ Vincent Cheng ] diff -Nru f2fs-tools-1.16.0/debian/f2fs-tools.install f2fs-tools-1.16.0/debian/f2fs-tools.install --- f2fs-tools-1.16.0/debian/f2fs-tools.install 2023-07-17 06:02:17.0 +0200 +++ f2fs-tools-1.16.0/debian/f2fs-tools.install 2023-12-23 23:39:28.0 +0100 @@ -1,4 +1,4 @@ # All but sbin/sg_write_buffer -sbin/*f2fs* +usr/sbin/*f2fs* usr/share/man/man8/*.8 diff -Nru f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install --- f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install 2023-07-17 06:02:17.0 +0200 +++ f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install 2023-12-23 23:39:40.0 +0100 @@ -1,2 +1,2 @@ # All but sbin/sg_write_buffer -sbin/*f2fs* +usr/sbin/*f2fs* diff -Nru f2fs-tools-1.16.0/debian/rules f2fs-tools-1.16.0/debian/rules --- f2fs-tools-1.16.0/debian/rules 2023-07-17 06:02:17.0 +0200 +++ f2fs-tools-1.16.0/debian/rules 2023-12-23 23:40:13.0 +0100 @@ -10,8 +10,8 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- --sbindir=/sbin --disable-shared \ - --with-root-libdir=/lib/$(DEB_HOST_MULTIARCH) + dh_auto_configure -- --sbindir=/usr/sbin --disable-shared \ + --with-root-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) # dh_dwz when run on f2fs-tools-udeb ends up installing the # /usr/lib/debug/.dwz files into the udeb. I think that's a bug,
Bug#1056972: diod: diff for NMU version 1.0.24-5.1
Control: tags 1056972 + patch Control: tags 1056972 + pending Dear maintainer, I've prepared an NMU for diod (versioned as 1.0.24-5.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Chris diff -Nru diod-1.0.24/debian/changelog diod-1.0.24/debian/changelog --- diod-1.0.24/debian/changelog 2020-03-16 23:20:44.0 +0100 +++ diod-1.0.24/debian/changelog 2023-11-27 12:39:55.0 +0100 @@ -1,3 +1,11 @@ +diod (1.0.24-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Move mount.diod symlink into /usr. (Closes: #1056972) + * Update Build-Depends libncurses5-dev to libncurses-dev. + + -- Chris Hofstaedtler Mon, 27 Nov 2023 12:39:55 +0100 + diod (1.0.24-5) unstable; urgency=medium * Don't depend on libattr1-dev for use from diff -Nru diod-1.0.24/debian/control diod-1.0.24/debian/control --- diod-1.0.24/debian/control 2020-03-16 23:20:44.0 +0100 +++ diod-1.0.24/debian/control 2023-11-27 12:39:55.0 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Євгеній Мещеряков Build-Depends: debhelper (>= 10~), libpopt-dev, liblua5.1-0-dev, - libmunge-dev, libcap-dev, libncurses5-dev, libwrap0-dev, + libmunge-dev, libcap-dev, libncurses-dev, libwrap0-dev, valgrind [amd64 i386 powerpc], pkg-config Build-Conflicts: valgrind [armel] Standards-Version: 4.5.0 diff -Nru diod-1.0.24/debian/diod.dirs diod-1.0.24/debian/diod.dirs --- diod-1.0.24/debian/diod.dirs 2020-03-16 23:20:44.0 +0100 +++ diod-1.0.24/debian/diod.dirs 2023-11-27 12:39:55.0 +0100 @@ -1,2 +1,2 @@ -sbin +usr/sbin usr/share/doc/diod/examples diff -Nru diod-1.0.24/debian/diod.links diod-1.0.24/debian/diod.links --- diod-1.0.24/debian/diod.links 2020-03-16 23:20:44.0 +0100 +++ diod-1.0.24/debian/diod.links 2023-11-27 12:39:55.0 +0100 @@ -1,2 +1,2 @@ -usr/sbin/diodmount sbin/mount.diod +usr/sbin/diodmount usr/sbin/mount.diod usr/share/man/man8/diodmount.8.gz usr/share/man/man8/mount.diod.8.gz
Bug#1059378: dahdi-firmware: install files into /usr (instead of /)
Source: dahdi-firmware Version: 2.11.1.0.20170917-2 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a patch to implement such a move. The patch does not try to update various paths in helper scripts or Makefiles, as that is of limited value from my point of view. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru dahdi-firmware-2.11.1.0.20170917/debian/changelog dahdi-firmware-2.11.1.0.20170917/debian/changelog --- dahdi-firmware-2.11.1.0.20170917/debian/changelog 2023-01-28 02:07:36.0 +0100 +++ dahdi-firmware-2.11.1.0.20170917/debian/changelog 2023-12-23 22:20:01.0 +0100 @@ -1,3 +1,10 @@ +dahdi-firmware (2.11.1.0.20170917-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr instead of /. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 23 Dec 2023 22:20:01 +0100 + dahdi-firmware (2.11.1.0.20170917-2) unstable; urgency=medium * Move source and binary from non-free/comm to non-free-firmware/comm diff -Nru dahdi-firmware-2.11.1.0.20170917/debian/install dahdi-firmware-2.11.1.0.20170917/debian/install --- dahdi-firmware-2.11.1.0.20170917/debian/install 2016-04-19 21:43:39.0 +0200 +++ dahdi-firmware-2.11.1.0.20170917/debian/install 2023-12-23 22:19:54.0 +0100 @@ -3,4 +3,4 @@ debian/get-digium-firmware usr/share/dahdi debian/OCT6104E-256D.ima usr/share/dahdi build_tools/install_firmware usr/share/dahdi -drivers/dahdi/dahdi-fw-*.bin lib/firmware/ +drivers/dahdi/dahdi-fw-*.bin usr/lib/firmware/
Bug#1059374: bluez-firmware: install files into /usr (instead of /)
Source: bluez-firmware Version: 1.2-9 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru bluez-firmware-1.2/debian/changelog bluez-firmware-1.2/debian/changelog --- bluez-firmware-1.2/debian/changelog 2023-01-28 04:00:16.0 +0100 +++ bluez-firmware-1.2/debian/changelog 2023-12-23 21:28:15.0 +0100 @@ -1,3 +1,10 @@ +bluez-firmware (1.2-9.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr instead of /. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 23 Dec 2023 21:28:15 +0100 + bluez-firmware (1.2-9) unstable; urgency=medium * Move source and binary from non-free/kernel to non-free-firmware/kernel diff -Nru bluez-firmware-1.2/debian/rules bluez-firmware-1.2/debian/rules --- bluez-firmware-1.2/debian/rules 2023-01-17 00:01:20.0 +0100 +++ bluez-firmware-1.2/debian/rules 2023-12-23 21:28:14.0 +0100 @@ -6,14 +6,14 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- --libdir=/lib + dh_auto_configure -- --libdir=/usr/lib override_dh_auto_install: dh_auto_install mkdir -p $(DEB_DESTDIR)/usr/share/doc/bluez-firmware - mv $(DEB_DESTDIR)/lib/firmware/BCM-LEGAL.txt \ + mv $(DEB_DESTDIR)/usr/lib/firmware/BCM-LEGAL.txt \ $(DEB_DESTDIR)/usr/share/doc/bluez-firmware/ # Copy firmware of Raspberry Pi - mkdir -p $(DEB_DESTDIR)/lib/firmware/brcm + mkdir -p $(DEB_DESTDIR)/usr/lib/firmware/brcm cp $(CURDIR)/debian/firmware/broadcom/*.hcd \ - $(DEB_DESTDIR)/lib/firmware/brcm/. + $(DEB_DESTDIR)/usr/lib/firmware/brcm/.
Bug#1059373: bcachefs-tools: install files into /usr (instead of /)
Source: bcachefs-tools Version: 24+really1.3.4-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru bcachefs-tools-24+really1.3.4/debian/changelog bcachefs-tools-24+really1.3.4/debian/changelog --- bcachefs-tools-24+really1.3.4/debian/changelog 2023-11-21 16:26:13.0 +0100 +++ bcachefs-tools-24+really1.3.4/debian/changelog 2023-12-23 21:19:30.0 +0100 @@ -1,3 +1,10 @@ +bcachefs-tools (24+really1.3.4-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr instead of /. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 23 Dec 2023 21:19:30 +0100 + bcachefs-tools (24+really1.3.4-1) unstable; urgency=medium * New upstream release diff -Nru bcachefs-tools-24+really1.3.4/debian/rules bcachefs-tools-24+really1.3.4/debian/rules --- bcachefs-tools-24+really1.3.4/debian/rules 2023-10-28 19:12:56.0 +0200 +++ bcachefs-tools-24+really1.3.4/debian/rules 2023-12-23 21:19:30.0 +0100 @@ -5,6 +5,7 @@ export NO_RUST=-true PREFIX := /usr +ROOT_SBINDIR := /usr/sbin DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) @@ -17,6 +18,6 @@ dh $@ override_dh_auto_install: - dh_auto_install -- "PREFIX=$(PREFIX)" + dh_auto_install -- "PREFIX=$(PREFIX)" "ROOT_SBINDIR=$(ROOT_SBINDIR)" override_dh_auto_test:
Bug#1059372: amd64-microcode: install files into /usr (instead of /)
Source: amd64-microcode
Version: 3.20231019.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi!
Your package installs files directly into /. For the ongoing Debian UsrMerge
effort [1] these files should move to /usr in the trixie cycle.
I'm attaching a trivial patch to implement such a move.
However, please still read the wiki page on moving files, especially if you
intend to backport to bookworm or earlier. The patch has already been checked
by a local dumat copy.
If during the trixie cycle your package will undergo structural changes or any
other file moves, please also see the wiki and upload to experimental first
when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru amd64-microcode-3.20231019.1/debian/amd64-microcode.dirs amd64-microcode-3.20231019.1+nmu1/debian/amd64-microcode.dirs
--- amd64-microcode-3.20231019.1/debian/amd64-microcode.dirs 2023-10-21 20:01:08.0 +0200
+++ amd64-microcode-3.20231019.1+nmu1/debian/amd64-microcode.dirs 2023-12-23 21:05:37.0 +0100
@@ -1,4 +1,4 @@
etc/default
etc/modprobe.d
-lib/firmware/amd-ucode
-lib/firmware/amd
+usr/lib/firmware/amd-ucode
+usr/lib/firmware/amd
diff -Nru amd64-microcode-3.20231019.1/debian/amd64-microcode.install amd64-microcode-3.20231019.1+nmu1/debian/amd64-microcode.install
--- amd64-microcode-3.20231019.1/debian/amd64-microcode.install 2023-10-21 20:01:08.0 +0200
+++ amd64-microcode-3.20231019.1+nmu1/debian/amd64-microcode.install 2023-12-23 21:05:37.0 +0100
@@ -1,2 +1,2 @@
-amd-ucode/*bin lib/firmware/amd-ucode
-amd/*sev*bin lib/firmware/amd
+amd-ucode/*bin usr/lib/firmware/amd-ucode
+amd/*sev*bin usr/lib/firmware/amd
diff -Nru amd64-microcode-3.20231019.1/debian/changelog amd64-microcode-3.20231019.1+nmu1/debian/changelog
--- amd64-microcode-3.20231019.1/debian/changelog 2023-10-21 20:06:29.0 +0200
+++ amd64-microcode-3.20231019.1+nmu1/debian/changelog 2023-12-23 21:05:37.0 +0100
@@ -1,3 +1,10 @@
+amd64-microcode (3.20231019.1+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install files into /usr instead of /. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 23 Dec 2023 21:05:37 +0100
+
amd64-microcode (3.20231019.1) unstable; urgency=medium
* Update package data from linux-firmware 20231019
diff -Nru amd64-microcode-3.20231019.1/debian/initramfs.hook amd64-microcode-3.20231019.1+nmu1/debian/initramfs.hook
--- amd64-microcode-3.20231019.1/debian/initramfs.hook 2023-10-21 19:59:34.0 +0200
+++ amd64-microcode-3.20231019.1+nmu1/debian/initramfs.hook 2023-12-23 21:05:37.0 +0100
@@ -31,7 +31,7 @@
:
}
-AUCODE_FW_DIR=/lib/firmware/amd-ucode
+AUCODE_FW_DIR=/usr/lib/firmware/amd-ucode
AMD64UCODE_INITRAMFS=auto
[ -r ${AMD64UCODE_CONFIG} ] && . ${AMD64UCODE_CONFIG}
Bug#1059371: snoopy: installs library into /lib
Source: snoopy Version: 2.5.1-1 User: helm...@debian.org Usertags: dep17m2 Hi, snoopy installs its library into /lib/. For the currently ongoing Debian UsrMerge effort [1] the library should move into /usr/lib/. While checking your package more carefully I noticed it can change /etc/ld.so.preload (depending on a debconf prompt). Without any modification I think the current code would do nothing on upgrading from a current version to a moved-into-usr version. This might be okay, but it would seem cleaner to clean up the old path. Please investigate what the best option is here and then move the files. Please also see [1] about how to move, and uploading to experimental. Idle question: how does this work in multiarch scenarios? Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059368: nsncd: installs new files into /
Source: nsncd Version: 1.4.1-1 User: helm...@debian.org Usertags: dep17m2 Hi, your package nsncd started installing new files into /, instead of placing them below /usr. For the Debian UsrMerge effort [1], these need to move to /usr. Filelist: ./lib/ ./lib/systemd/ ./lib/systemd/system/ ./lib/systemd/system/nsncd.service Please see wiki page [1] about moving files. Given this is just a systemd service unit, it can be beneficial to use dh_installsystemd, instead of installing it as a file. Alternatively, `pkg-config --variable=systemdsystemunitdir systemd` also knows the "correct" place (this is usually suitable for fixing upstream). Thanks, Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059366: mgetty: install files into /usr (instead of /)
Source: mgetty Version: 1.2.1-1.2 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru mgetty-1.2.1/debian/changelog mgetty-1.2.1/debian/changelog --- mgetty-1.2.1/debian/changelog 2022-04-14 17:12:32.0 +0200 +++ mgetty-1.2.1/debian/changelog 2023-12-23 19:26:37.0 +0100 @@ -1,3 +1,10 @@ +mgetty (1.2.1-1.3) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr instead of /. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 23 Dec 2023 19:26:37 +0100 + mgetty (1.2.1-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru mgetty-1.2.1/debian/mgetty.dirs mgetty-1.2.1/debian/mgetty.dirs --- mgetty-1.2.1/debian/mgetty.dirs 2022-04-14 15:50:17.0 +0200 +++ mgetty-1.2.1/debian/mgetty.dirs 2023-12-23 19:26:37.0 +0100 @@ -1,7 +1,6 @@ usr/share/mgetty/templates/etc usr/bin usr/sbin -sbin var/spool var/log/mgetty etc/mgetty diff -Nru mgetty-1.2.1/debian/rules mgetty-1.2.1/debian/rules --- mgetty-1.2.1/debian/rules 2022-04-14 15:50:53.0 +0200 +++ mgetty-1.2.1/debian/rules 2023-12-23 19:26:37.0 +0100 @@ -120,10 +120,6 @@ cp voice/ChangeLog \ $(DEBIAN_DIR)/mgetty-voice/usr/share/doc/mgetty/changelog.voice -# Enforce debian standard for location of getty's - mv $(DEBIAN_DIR)/mgetty/usr/sbin/?getty \ - $(DEBIAN_DIR)/mgetty/sbin/ - # And usr/sbin stuff mv $(DEBIAN_DIR)/mgetty/usr/bin/faxrunq \ $(DEBIAN_DIR)/mgetty-fax/usr/bin/
Bug#1059365: mergerfs: install files into /usr (instead of /)
Source: mergerfs Version: 2.33.5-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi! Your package installs files directly into /. For the ongoing Debian UsrMerge effort [1] these files should move to /usr in the trixie cycle. I'm attaching a patch to implement such a move. However, please still read the wiki page on moving files, especially if you intend to backport to bookworm or earlier. The patch has already been checked by a local dumat copy. If during the trixie cycle your package will undergo structural changes or any other file moves, please also see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru mergerfs-2.33.5/debian/changelog mergerfs-2.33.5/debian/changelog --- mergerfs-2.33.5/debian/changelog 2022-09-02 13:30:28.0 +0200 +++ mergerfs-2.33.5/debian/changelog 2023-12-23 19:01:58.0 +0100 @@ -1,3 +1,10 @@ +mergerfs (2.33.5-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install into /usr/sbin instead of /sbin. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 23 Dec 2023 19:01:58 +0100 + mergerfs (2.33.5-1) unstable; urgency=medium * New upstream version 2.33.5 diff -Nru mergerfs-2.33.5/debian/rules mergerfs-2.33.5/debian/rules --- mergerfs-2.33.5/debian/rules 2021-08-17 12:05:44.0 +0200 +++ mergerfs-2.33.5/debian/rules 2023-12-23 18:58:33.0 +0100 @@ -23,4 +23,4 @@ # Because there's no auto* files shipped anymore override_dh_auto_install: - $(MAKE) DESTDIR=$(CURDIR)/debian/mergerfs PREFIX=/usr install STRIP=true + $(MAKE) DESTDIR=$(CURDIR)/debian/mergerfs PREFIX=/usr SBINDIR=/usr/sbin install STRIP=true
Bug#1059283: mate-settings-daemon: use udev.pc to place udev rules
Source: mate-settings-daemon
Version: 1.26.0-2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable, and is safe to do
now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
Note that a simpler approach would be this, but if you intend to
backport to bookworm, you need to remember changing it back:
-[linux-any] usr/lib/udev/rules.d/ lib/udev
+[linux-any] usr/lib/udev/rules.d/
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru mate-settings-daemon-1.26.0/debian/changelog mate-settings-daemon-1.26.0/debian/changelog
--- mate-settings-daemon-1.26.0/debian/changelog 2023-09-10 14:02:31.0 +0200
+++ mate-settings-daemon-1.26.0/debian/changelog 2023-12-22 12:31:52.0 +0100
@@ -1,3 +1,10 @@
+mate-settings-daemon (1.26.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Fri, 22 Dec 2023 12:31:52 +0100
+
mate-settings-daemon (1.26.0-2) unstable; urgency=medium
[ Martin Wimpress ]
diff -Nru mate-settings-daemon-1.26.0/debian/control mate-settings-daemon-1.26.0/debian/control
--- mate-settings-daemon-1.26.0/debian/control 2023-09-10 14:02:31.0 +0200
+++ mate-settings-daemon-1.26.0/debian/control 2023-12-22 11:54:14.0 +0100
@@ -33,6 +33,8 @@
libxrandr-dev,
libxt-dev,
mate-common (>= 1.18),
+ pkgconf,
+ systemd-dev,
x11proto-kb-dev,
Standards-Version: 4.6.0
Rules-Requires-Root: no
diff -Nru mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install
--- mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install 2019-08-11 13:32:02.0 +0200
+++ mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install 2023-12-22 12:31:43.0 +0100
@@ -1,6 +1,6 @@
#! /usr/bin/dh-exec
-[linux-any] usr/lib/udev/rules.d/ lib/udev
+[linux-any] usr/lib/udev/rules.d/ ${deb_udevdir}
usr/share/glib-2.0/
usr/share/icons/
usr/share/locale/
diff -Nru mate-settings-daemon-1.26.0/debian/rules mate-settings-daemon-1.26.0/debian/rules
--- mate-settings-daemon-1.26.0/debian/rules 2019-08-11 13:32:02.0 +0200
+++ mate-settings-daemon-1.26.0/debian/rules 2023-12-22 12:31:52.0 +0100
@@ -9,8 +9,10 @@
DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS)))
WITHOUT_RFKILL = "--disable-rfkill"
+export deb_udevdir =
else
WITHOUT_RFKILL = ""
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
endif
Bug#1059190: apt-cacher-ng: installs empty /lib/systemd/system directory
Source: apt-cacher-ng Version: 3.7.4-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package ships (after a rebuild) an empty directory /lib/systemd/system. For the Debian UsrMerge effort [1] these directories should go away. I'm attaching a patch to clean this up. Please apply it at your earliest convenience. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru apt-cacher-ng-3.7.4/debian/changelog apt-cacher-ng-3.7.4/debian/changelog --- apt-cacher-ng-3.7.4/debian/changelog 2021-12-07 14:50:20.0 +0100 +++ apt-cacher-ng-3.7.4/debian/changelog 2023-12-21 01:31:41.0 +0100 @@ -1,3 +1,10 @@ +apt-cacher-ng (3.7.4-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Avoid installing empty /lib/systemd/system directory. (Closes: #-1) + + -- Chris Hofstaedtler Thu, 21 Dec 2023 01:31:41 +0100 + apt-cacher-ng (3.7.4-1) unstable; urgency=medium * New upstream version diff -Nru apt-cacher-ng-3.7.4/debian/rules apt-cacher-ng-3.7.4/debian/rules --- apt-cacher-ng-3.7.4/debian/rules 2021-12-07 14:50:20.0 +0100 +++ apt-cacher-ng-3.7.4/debian/rules 2023-12-21 01:31:41.0 +0100 @@ -37,6 +37,7 @@ # let dh_systemd deal with them mv $(TGT)/usr/lib/tmpfiles.d/apt-cacher-ng.conf debian/apt-cacher-ng.tmpfile mv $(TGT)/lib/systemd/system/*.service debian/ + rmdir --parents --ignore-fail-on-non-empty $(TGT)/lib/systemd/system $(MAKE) -C dbgen package DBGENERATOR=dbgenerator test -r debian/apt-cacher-ng/etc/apt-cacher-ng/backends_debian.default || mv debian/apt-cacher-ng/usr/lib/apt-cacher-ng/backends_debian.default debian/apt-cacher-ng/etc/apt-cacher-ng/ test -r debian/apt-cacher-ng/etc/apt-cacher-ng/backends_ubuntu.default || mv debian/apt-cacher-ng/usr/lib/apt-cacher-ng/backends_ubuntu.default debian/apt-cacher-ng/etc/apt-cacher-ng/
Bug#1058787: closed by Debian FTP Masters (reply to bott...@debian.org (A. Maitland Bottoms)) (Bug#1058787: fixed in libmirisdr 2.0.0-3)
On Sat, Dec 16, 2023 at 02:51:03PM +, Debian Bug Tracking System wrote: >* upload to experimental for dumat tool >* Move udev files from /lib to /usr/lib, including protective diversion > against Multi-Arch: same file loss scenario (DEP17 P7 M10). > (Closes: #1058787) Please go ahead with an upload to unstable. Chris
Bug#1059189: quota: move files from / to /usr
Source: quota Version: 4.06-1 Severity: normal Tags: patch moreinfo User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs programs directly into /sbin. For the ongoing Debian UsrMerge effort [1] these files should move to /usr/sbin in the trixie cycle. I'm attaching a mostly mechanical patch to implement that. Please review, test and upload at your earliest convenience. Also see the wiki about uploading to experimental first, and to unstable after a few days. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru quota-4.06/debian/changelog quota-4.06/debian/changelog --- quota-4.06/debian/changelog 2021-02-09 13:22:57.0 +0100 +++ quota-4.06/debian/changelog 2023-12-21 01:16:34.0 +0100 @@ -1,3 +1,11 @@ +quota (4.06-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install binary programs into /usr/sbin. (Closes: #-1) + * Update paths to /usr/sbin in (init) scripts, systemd service. + + -- Chris Hofstaedtler Thu, 21 Dec 2023 01:16:34 +0100 + quota (4.06-1) unstable; urgency=medium * New upstream version 4.06 diff -Nru quota-4.06/debian/dirs quota-4.06/debian/dirs --- quota-4.06/debian/dirs 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/dirs 2023-12-21 01:16:34.0 +0100 @@ -1,6 +1,5 @@ usr/bin usr/sbin -sbin etc/init.d usr/share/man/man1 usr/share/man/man2 diff -Nru quota-4.06/debian/quota.init quota-4.06/debian/quota.init --- quota-4.06/debian/quota.init 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/quota.init 2023-12-21 01:16:34.0 +0100 @@ -13,7 +13,7 @@ DESC="quota service" # names of binaries -on=/sbin/quotaon +on=/usr/sbin/quotaon set -e diff -Nru quota-4.06/debian/quota-initial-check.sh quota-4.06/debian/quota-initial-check.sh --- quota-4.06/debian/quota-initial-check.sh 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/quota-initial-check.sh 2023-12-21 01:16:34.0 +0100 @@ -1,8 +1,8 @@ #!/bin/sh # names of binaries -check=/sbin/quotacheck -on=/sbin/quotaon +check=/usr/sbin/quotacheck +on=/usr/sbin/quotaon quotaisnew=/var/lib/quota/new ALLFLAGS=-aug diff -Nru quota-4.06/debian/quotaoff.sh quota-4.06/debian/quotaoff.sh --- quota-4.06/debian/quotaoff.sh 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/quotaoff.sh 2023-12-21 01:16:34.0 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # names of binaries -off=/sbin/quotaoff +off=/usr/sbin/quotaoff quotaisoff=/var/lib/quota/off ALLFLAGS=-aug diff -Nru quota-4.06/debian/quotaon.sh quota-4.06/debian/quotaon.sh --- quota-4.06/debian/quotaon.sh 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/quotaon.sh 2023-12-21 01:16:34.0 +0100 @@ -1,8 +1,8 @@ #!/bin/sh # names of binaries -check=/sbin/quotacheck -on=/sbin/quotaon +check=/usr/sbin/quotacheck +on=/usr/sbin/quotaon quotaisoff=/var/lib/quota/off quotaisnew=/var/lib/quota/new forcequotacheck=/forcequotacheck diff -Nru quota-4.06/debian/quotarpc.service quota-4.06/debian/quotarpc.service --- quota-4.06/debian/quotarpc.service 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/quotarpc.service 2023-12-21 01:16:34.0 +0100 @@ -5,7 +5,7 @@ PartOf=nfs-server.target After=rpcbind.service Before=nfs-server.target -ConditionFileIsExecutable=/sbin/rpcbind +ConditionFileIsExecutable=/usr/sbin/rpcbind [Service] Type=forking diff -Nru quota-4.06/debian/rules quota-4.06/debian/rules --- quota-4.06/debian/rules 2021-02-09 13:05:00.0 +0100 +++ quota-4.06/debian/rules 2023-12-21 01:16:23.0 +0100 @@ -57,10 +57,6 @@ # Add here commands to install the package into debian/quota. $(MAKE) DESTDIR=`pwd`/debian/quota install - -mv `pwd`/debian/quota/usr/sbin/quotacheck `pwd`/debian/quota/sbin - -mv `pwd`/debian/quota/usr/sbin/quotaon `pwd`/debian/quota/sbin - -mv `pwd`/debian/quota/usr/sbin/quotaoff `pwd`/debian/quota/sbin - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default.
Bug#1059188: rdma-core: installs files below /lib
Source: rdma-core Version: 48.0-1 User: helm...@debian.org Usertags: dep17m2 Hi! The rdma-core binary packages installs a number of files below /lib. For the ongoing Debian UsrMerge effort [1], these should be moved below /usr/lib. Currently the files installed are: - lib/systemd/system/ibacm.service - lib/systemd/system/ibacm.socket - lib/systemd/system/iwpmd.service - lib/systemd/system/rdma-hw.target - lib/systemd/system/rdma-load-modules@.service - lib/systemd/system/rdma-ndd.service - lib/systemd/system/srp_daemon.service - lib/systemd/system/srp_daemon_port@.service - lib/systemd/system/srptools.service -> srp_daemon.service - lib/udev/rdma_rename - lib/udev/rules.d/ - lib/udev/rules.d/60-rdma-ndd.rules - lib/udev/rules.d/60-rdma-persistent-naming.rules - lib/udev/rules.d/60-srp_daemon.rules - lib/udev/rules.d/75-rdma-description.rules - lib/udev/rules.d/90-iwpmd.rules - lib/udev/rules.d/90-rdma-hw-modules.rules - lib/udev/rules.d/90-rdma-ulp-modules.rules - lib/udev/rules.d/90-rdma-umad.rules Please investigate moving these below /usr/lib. When doing so, make sure your packages do not install empty directories inside /lib (or /lib itself). For the correct place of the systemd system units, you can ask: pkg-config --variable=systemdsystemunitdir systemd Provided you add systemd-dev to Build-Depends. For the correct place for the udev files (= previously /lib/udev), you can ask: pkg-config --variable=udevdir udev Again, add systemd-dev to Build-Depends. Please see the wiki [1] for further information and on uploading to experimental first. Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059187: samba: installs files into /lib/...
Source: samba Version: 2:4.19.3+dfsg-2 User: helm...@debian.org Usertags: dep17m2 Hi! The samba binary packages installs a number of files below /lib. For the ongoing Debian UsrMerge effort [1], these should be moved below /usr/lib. Currently the files installed are: - lib/systemd/system/ctdb.service - lib/systemd/system/nmb.service -> nmbd.service - lib/systemd/system/nmbd.service - lib/systemd/system/samba-ad-dc.service - lib/systemd/system/samba.service -> samba-ad-dc.service - lib/systemd/system/smb.service -> smbd.service - lib/systemd/system/smbd.service - lib/systemd/system/winbind.service - lib/x86_64-linux-gnu/libnss_winbind.so.2 - lib/x86_64-linux-gnu/libnss_wins.so.2 - lib/x86_64-linux-gnu/security/pam_winbind.so Please investigate moving these below /usr/lib. When doing so, make sure your packages do not install empty directories inside /lib (or /lib itself). For the correct place of the systemd system units, you can ask: pkg-config --variable=systemdsystemunitdir systemd Provided you add systemd-dev to Build-Depends. Please see the wiki [1] for further information and on uploading to experimental first. Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059186: sane-backends: installs saned.service mask into /lib
Source: sane-backends Version: 1.2.1-7 User: helm...@debian.org Usertags: dep17m2 Hi! sane-backends currently installs this symlink: lib/systemd/system/saned.service -> /dev/null For the ongoing Debian UsrMerge effort [1], /lib should become empty, and instead /usr/lib should be used. To find the correct location of saned.service, you can ask `pkg-config --variable systemdsystemunitdir systemd` Please investigate updating your packaging and check the wiki about uploading to experimental, and then to unstable. Thanks, Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059185: gpsd: installs systemd service into /lib
Source: gpsd Version: 3.25-2 User: helm...@debian.org Usertags: dep17m2 Hi! gpsd installs its systemd service into /lib/systemd/system, apparently ignoring the systemd.pc pkg-config data. Please make sure to install into /usr/lib/systemd/system on trixie, but keep installing into the old location for bookworm-backports. Please see the wiki page [1] for details on how to move. Thanks, Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059182: writeboost: installs files into /sbin
Package: writeboost Version: 1.20170616-1.2 Severity: normal Tags: patch writeboost installs its binary into /sbin. For the ongoing Debian UsrMerge effort [1] this needs to move to /usr/sbin. For your convenience I'm attaching a patch implementing that. Please see the wiki about uploading to experimental. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru writeboost-1.20170616/debian/changelog writeboost-1.20170616/debian/changelog --- writeboost-1.20170616/debian/changelog 2022-10-15 12:57:24.0 +0200 +++ writeboost-1.20170616/debian/changelog 2023-12-21 00:37:03.0 +0100 @@ -1,3 +1,10 @@ +writeboost (1.20170616-1.3) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install into /usr. (Closes: #-1) + + -- Chris Hofstaedtler Thu, 21 Dec 2023 00:37:03 +0100 + writeboost (1.20170616-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru writeboost-1.20170616/debian/install writeboost-1.20170616/debian/install --- writeboost-1.20170616/debian/install 2015-06-30 12:24:46.0 +0200 +++ writeboost-1.20170616/debian/install 2023-12-21 00:35:24.0 +0100 @@ -1,2 +1,2 @@ etc/*/etc/ -sbin/* /sbin/ +sbin/* /usr/sbin/ diff -Nru writeboost-1.20170616/debian/patches/series writeboost-1.20170616/debian/patches/series --- writeboost-1.20170616/debian/patches/series 1970-01-01 01:00:00.0 +0100 +++ writeboost-1.20170616/debian/patches/series 2023-12-21 00:36:13.0 +0100 @@ -0,0 +1 @@ +usr-sbin.patch diff -Nru writeboost-1.20170616/debian/patches/usr-sbin.patch writeboost-1.20170616/debian/patches/usr-sbin.patch --- writeboost-1.20170616/debian/patches/usr-sbin.patch 1970-01-01 01:00:00.0 +0100 +++ writeboost-1.20170616/debian/patches/usr-sbin.patch 2023-12-21 00:36:56.0 +0100 @@ -0,0 +1,30 @@ +Description: Assume UsrMerge install-layout +Author: Chris Hofstaedtler + +--- +Last-Update: 2023-12-20 + +--- writeboost-1.20170616.orig/writeboost.init writeboost-1.20170616/writeboost.init +@@ -12,7 +12,7 @@ + # Description: (dm-)writeboost is a log-structured cache for Linux + ### END INIT INFO + +-DAEMON=/sbin/writeboost ++DAEMON=/usr/sbin/writeboost + NAME=writeboost + + # Exit if executable is not installed +--- writeboost-1.20170616.orig/writeboost.service writeboost-1.20170616/writeboost.service +@@ -18,8 +18,8 @@ RemainAfterExit=yes + ## Scannong caching devices may take long time after unclean shutdown. + TimeoutStartSec=999 + +-ExecStart=/sbin/writeboost +-ExecStop=/sbin/writeboost -u ++ExecStart=/usr/sbin/writeboost ++ExecStop=/usr/sbin/writeboost -u + + ## Long "TimeoutStop" is essential as deadlock may happen if writeboost + ## is killed during flushing of caches on shutdown, etc.
Bug#1059181: elvis-tiny: installs files into /bin
Source: elvis-tiny Version: 1.4-24.1 Severity: normal Tags: patch elvis-tiny installs files into /bin. For the ongoing Debian UsrMerge effort [1], we want that directory to become empty, and instead use /usr/bin. For your convenience, I'm attaching a patch to implement that. Please see the wiki about uploading to experimental. Thanks for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru elvis-tiny-1.4/debian/changelog elvis-tiny-1.4/debian/changelog --- elvis-tiny-1.4/debian/changelog 2022-10-06 23:10:44.0 +0200 +++ elvis-tiny-1.4/debian/changelog 2023-12-21 00:28:40.0 +0100 @@ -1,3 +1,10 @@ +elvis-tiny (1.4-24.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install into /usr/bin instead of /bin. (Closes: #-1) + + -- Chris Hofstaedtler Thu, 21 Dec 2023 00:28:40 +0100 + elvis-tiny (1.4-24.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru elvis-tiny-1.4/debian/rules elvis-tiny-1.4/debian/rules --- elvis-tiny-1.4/debian/rules 2022-10-06 23:10:44.0 +0200 +++ elvis-tiny-1.4/debian/rules 2023-12-21 00:28:26.0 +0100 @@ -12,8 +12,8 @@ dh_auto_build -- -f Makefile.mix EXTRA_CFLAGS="$(EXTRA_CFLAGS)" override_dh_auto_install: - install -m 755 -d $(tmp)/bin - install -m 755 elvis $(tmp)/bin/elvis-tiny + install -m 755 -d $(tmp)/usr/bin + install -m 755 elvis $(tmp)/usr/bin/elvis-tiny override_dh_auto_clean: make -f Makefile.mix clobber
Bug#1059180: asterisk: use systemd.pc to place systemd system units
Source: asterisk
Version: 1:20.5.1~dfsg+~cs6.13.40431414-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs systemd system units, currently into /lib.
These files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using systemd.pc to place these files
(using pkg-config). This works for unstable today, and is safe to
do now.
It should also work for bookworm-backports, but I have not verified
that.
Later during the trixie cycle I expect this bug class to raise in
priority.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/asterisk.install asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/asterisk.install
--- asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/asterisk.install 2022-07-30 09:58:40.0 +0200
+++ asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/asterisk.install 2023-12-21 00:11:17.0 +0100
@@ -1,4 +1,4 @@
-lib/systemd/system/asterisk.service
+${env:deb_systemdsystemunitdir}/asterisk.service
usr/bin/asterisk-config-custom
usr/lib/${DEB_HOST_MULTIARCH}/libasterisk*
usr/sbin
diff -Nru asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/changelog asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/changelog
--- asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/changelog 2023-12-19 17:38:11.0 +0100
+++ asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/changelog 2023-12-21 00:11:25.0 +0100
@@ -1,3 +1,10 @@
+asterisk (1:20.5.1~dfsg+~cs6.13.40431414-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use systemd.pc to place systemd service unit. (Closes: #-1)
+
+ -- Chris Hofstaedtler Thu, 21 Dec 2023 00:11:25 +0100
+
asterisk (1:20.5.1~dfsg+~cs6.13.40431414-1) unstable; urgency=high
[ upstream ]
diff -Nru asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/control asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/control
--- asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/control 2023-12-19 17:38:11.0 +0100
+++ asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/control 2023-12-21 00:09:08.0 +0100
@@ -72,6 +72,7 @@
libxslt1-dev,
perl ,
portaudio19-dev,
+ systemd-dev,
unixodbc-dev,
uuid-dev,
zlib1g-dev,
diff -Nru asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/rules asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/rules
--- asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/rules 2023-12-19 17:38:11.0 +0100
+++ asterisk-20.5.1~dfsg+~cs6.13.40431414/debian/rules 2023-12-21 00:11:25.0 +0100
@@ -78,6 +78,8 @@
# resolve if release is experimental
EXP_RELEASE = $(filter experimental% UNRELEASED,$(DEB_DISTRIBUTION))
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
%:
dh $@
@@ -183,6 +185,9 @@
cp -a debian/asterisk-config-custom debian/tmp/usr/bin/
cp -a debian/asterisk-config-custom.1 debian/tmp/usr/share/man/man1/
cp -a debian/50-asterisk debian/tmp/usr/share/dahdi/span_config.d/
+ mkdir -p debian/tmp/$(deb_systemdsystemunitdir)
+ test "$(deb_systemdsystemunitdir)" != "lib/systemd/system" && mv debian/tmp/lib/systemd/system/* debian/tmp/$(deb_systemdsystemunitdir)/ || true
+ rmdir --ignore-fail-on-non-empty --parents debian/tmp/lib/systemd/system
$(RM) -f debian/tmp/usr/sbin/conf2ael
$(RM) -f debian/tmp/usr/sbin/muted
$(RM) -f debian/tmp/usr/sbin/streamplayer
Bug#1059178: approx: install systemd units into /usr
Source: approx Version: 5.12-2 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs systemd units by hard-coding a path in /lib. For the ongoing Debian UsrMerge effort [1] these files should move to /usr/lib in the trixie cycle. For your convenience, I've attached a trivial patch. This needs to be reverted on backports to bookworm or earlier. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru approx-5.12/debian/approx.install approx-5.12/debian/approx.install --- approx-5.12/debian/approx.install 2023-09-10 06:10:50.0 +0200 +++ approx-5.12/debian/approx.install 2023-12-20 23:58:08.0 +0100 @@ -1,5 +1,5 @@ approx usr/sbin approx-import usr/sbin etc/approx.conf etc/approx -etc/approx.socket lib/systemd/system -etc/approx@.service lib/systemd/system +etc/approx.socket usr/lib/systemd/system +etc/approx@.service usr/lib/systemd/system diff -Nru approx-5.12/debian/changelog approx-5.12/debian/changelog --- approx-5.12/debian/changelog 2023-09-10 06:10:50.0 +0200 +++ approx-5.12/debian/changelog 2023-12-20 23:58:38.0 +0100 @@ -1,3 +1,10 @@ +approx (5.12-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install systemd units into /usr/lib/systemd/system. (Closes: #-1) + + -- Chris Hofstaedtler Wed, 20 Dec 2023 23:58:38 +0100 + approx (5.12-2) unstable; urgency=medium * Team upload
Bug#1057243: libnitrokey: diff for NMU version 3.7-1.1
Control: tags 1057243 + pending
Dear maintainer,
I've prepared an NMU for libnitrokey (versioned as 3.7-1.1) and
uploaded it to DELAYED/7. Please feel free to upload on your own in
the meantime.
Chris
diff -Nru libnitrokey-3.7/debian/changelog libnitrokey-3.7/debian/changelog
--- libnitrokey-3.7/debian/changelog 2022-05-20 17:30:38.0 +0200
+++ libnitrokey-3.7/debian/changelog 2023-12-21 00:00:34.0 +0100
@@ -1,3 +1,11 @@
+libnitrokey (3.7-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udevdir from udev.pc to determine udev rules install path.
+(Closes: #1057243)
+
+ -- Chris Hofstaedtler Thu, 21 Dec 2023 00:00:34 +0100
+
libnitrokey (3.7-1) unstable; urgency=medium
* New upstream release.
diff -Nru libnitrokey-3.7/debian/libnitrokey-common.install libnitrokey-3.7/debian/libnitrokey-common.install
--- libnitrokey-3.7/debian/libnitrokey-common.install 2022-05-20 17:06:46.0 +0200
+++ libnitrokey-3.7/debian/libnitrokey-common.install 2023-12-21 00:00:22.0 +0100
@@ -1 +1 @@
-lib/udev/rules.d/41-nitrokey.rules
+${env:deb_udevdir}/rules.d
diff -Nru libnitrokey-3.7/debian/rules libnitrokey-3.7/debian/rules
--- libnitrokey-3.7/debian/rules 2022-05-20 17:06:46.0 +0200
+++ libnitrokey-3.7/debian/rules 2023-12-21 00:00:22.0 +0100
@@ -5,5 +5,7 @@
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@ --with pkgkde_symbolshelper
Bug#1059177: makedev: move files from / to /usr
Source: makedev Version: 2.3.1-97 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs MAKEDEV directly into /sbin. For the ongoing Debian UsrMerge effort [1] it should move to /usr/sbin in the trixie cycle. For your convenience, I'm attaching a patch. Please upload to experimental first, and then after a few days to unstable. This way, the dumat tool [1] gets to check your package and can report new issues. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru makedev-2.3.1/debian/changelog makedev-2.3.1/debian/changelog --- makedev-2.3.1/debian/changelog 2022-06-03 14:07:08.0 +0200 +++ makedev-2.3.1/debian/changelog 2023-12-20 23:10:49.0 +0100 @@ -1,3 +1,10 @@ +makedev (2.3.1-97.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install into /usr/sbin instead of /sbin. (Closes: #-1) + + -- Chris Hofstaedtler Wed, 20 Dec 2023 23:10:49 +0100 + makedev (2.3.1-97) unstable; urgency=medium * debian/control: reverted relationship removal. (Closes: #1012283) diff -Nru makedev-2.3.1/debian/dirs makedev-2.3.1/debian/dirs --- makedev-2.3.1/debian/dirs 2022-06-03 14:07:08.0 +0200 +++ makedev-2.3.1/debian/dirs 2023-12-20 23:10:02.0 +0100 @@ -1,2 +1,2 @@ -sbin +usr/sbin usr/share/man/man8 diff -Nru makedev-2.3.1/debian/rules makedev-2.3.1/debian/rules --- makedev-2.3.1/debian/rules 2022-06-03 14:07:08.0 +0200 +++ makedev-2.3.1/debian/rules 2023-12-20 23:10:49.0 +0100 @@ -5,4 +5,4 @@ dh $@ override_dh_auto_install: - dh_auto_install -- ROOT=debian/makedev + dh_auto_install -- ROOT=debian/makedev BINDIR=debian/makedev/usr/sbin
Bug#1057016: Move unpaused
tags 1057016 - moreinfo tags 1057779 - moreinfo tags 1057817 - moreinfo thanks Hi, the move pause has been lifted. Please consider applying the patches. Thanks, Chris
Bug#1059173: lldpd: use systemd.pc to place systemd system units
Please find the patch attached.
Chris
>From 51f670a28a3790bc903c15affd5501c8f3552c95 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler
Date: Wed, 20 Dec 2023 22:53:15 +0100
Subject: [PATCH 1/2] Use pkg-config to place systemd service definition
---
debian/control | 1 +
debian/lldpd.install | 2 +-
debian/rules | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 0d1422c..17d3e5a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 13),
libcap-dev,
pkg-config,
check,
+ systemd-dev,
Standards-Version: 4.1.1
Vcs-Browser: https://salsa.debian.org/debian/lldpd
Vcs-Git: https://salsa.debian.org/debian/lldpd.git
diff --git a/debian/lldpd.install b/debian/lldpd.install
index 226cc73..6f5bfb3 100644
--- a/debian/lldpd.install
+++ b/debian/lldpd.install
@@ -1,4 +1,4 @@
-debian/tmp/lib/systemd/system/lldpd.service
+debian/tmp${env:deb_systemdsystemunitdir}/lldpd.service
debian/tmp/usr/lib/*/*.so.*
debian/tmp/usr/share/man/man8/*
debian/tmp/usr/sbin/lldp*
diff --git a/debian/rules b/debian/rules
index de4a84f..d818e34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export deb_systemdsystemunitdir=$(shell pkg-config --variable=systemdsystemunitdir systemd)
+
%:
dh $@
@@ -8,4 +10,4 @@ override_dh_auto_configure:
--enable-pie \
--with-snmp \
--with-xml \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=$(deb_systemdsystemunitdir)
--
2.39.2
Bug#1059173: lldpd: use systemd.pc to place systemd system units
Source: lldpd Version: Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs systemd system units, currently into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using systemd.pc to place these files (using pkg-config). This works for unstable today, and also for bookworm-backports, and is safe to do now. You can find the same patch here as a salsa merge request: https://salsa.debian.org/debian/lldpd/-/merge_requests/1 Later during the trixie cycle I expect this bug class to raise in priority. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge
Bug#1059172: loadlin: installs file into /sbin
Source: loadlin Version: 1.6f-10 User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs a file into /sbin (an "aliased" location). For the ongoing Debian UsrMerge effort [1], we need to move this path to /usr/sbin. In your package, this is only: /sbin/freeramdisk Please change your package to install it as: /usr/sbin/freeramdisk If other programs in your package reference it anywhere by full path, it is nice to update those references. However, since bookworm only usrmerged systems are supported; as such it is okay to keep using the old path. Unfortunately your package currently FTBFS, so I'm not attaching a patch at this time. Thank you for your consideration, Chris [1] https://wiki.debian.org/UsrMerge
Bug#1058767: netplug: unmaintained
Hi, * Pali Rohár [231216 11:35]: > On Friday 15 December 2023 21:56:01 Chris Hofstaedtler wrote: > Hello, I talked with the author of the netplug (Bryan O'Sullivan) and I > got permission to continue working on this project. I can continue > maintaining this package on Debian, so please let me know what is needed > to fix for preventing its removal. Thanks. Well, the immediate thing to do is: close this bug. But the more important thing: actually maintain the package, including ongoing quality work in the packaging, responding to/fixing bugs, etc. If I were in your shoes, I'd make sure to know if/where the users of this package are. If all users are using vyos, then maybe its better maintained as part of vyos, and removed from Debian. Debian has a number of other things that can react to network events, some of those have active upstreams ... Best, Chris
Bug#1059063: sudo: use systemd.pc to place systemd unit mask
Source: sudo Version: 1.9.15p3-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs a systemd system unit mask (symlink to /dev/null), currently into /lib. This symlink needs to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using systemd.pc to place it (using pkg-config). This works for unstable today, and also for bookworm-backports, and is safe to do now. Later during the trixie cycle I expect this bug class to raise in priority. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru sudo-1.9.15p3/debian/changelog sudo-1.9.15p3/debian/changelog --- sudo-1.9.15p3/debian/changelog 2023-12-14 20:22:51.0 +0100 +++ sudo-1.9.15p3/debian/changelog 2023-12-18 00:14:29.0 +0100 @@ -1,3 +1,10 @@ +sudo (1.9.15p3-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use systemd.pc to place systemd unit mask. (Closes: #-1) + + -- Chris Hofstaedtler Mon, 18 Dec 2023 00:14:29 +0100 + sudo (1.9.15p3-1) unstable; urgency=medium * new upstream version 1.9.15p3 diff -Nru sudo-1.9.15p3/debian/control sudo-1.9.15p3/debian/control --- sudo-1.9.15p3/debian/control 2023-12-14 20:22:51.0 +0100 +++ sudo-1.9.15p3/debian/control 2023-12-18 00:14:29.0 +0100 @@ -6,7 +6,7 @@ Hanno Wagner , Hilko Bengen , Bastian Blank -Build-Depends: debhelper-compat (= 13), dh-sequence-installnss, libpam0g-dev, libldap2-dev, libsasl2-dev, libselinux1-dev [linux-any], autoconf, bison, flex, libaudit-dev [linux-any], zlib1g-dev, po-debconf +Build-Depends: debhelper-compat (= 13), dh-sequence-installnss, libpam0g-dev, libldap2-dev, libsasl2-dev, libselinux1-dev [linux-any], autoconf, bison, flex, libaudit-dev [linux-any], zlib1g-dev, po-debconf, pkgconf, systemd Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/sudo-team/sudo.git diff -Nru sudo-1.9.15p3/debian/rules sudo-1.9.15p3/debian/rules --- sudo-1.9.15p3/debian/rules 2023-12-14 20:22:51.0 +0100 +++ sudo-1.9.15p3/debian/rules 2023-12-18 00:13:28.0 +0100 @@ -42,6 +42,8 @@ # building on a usrmerge or non-usrmerge system. CONFIGURE_ARGS += MVPROG=/bin/mv +deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd) + %: dh $@ @@ -75,8 +77,8 @@ for pkg in sudo sudo-ldap; do \ mv debian/$$pkg/etc/sudoers.dist \ debian/$$pkg/usr/share/doc/$$pkg/examples/sudoers.dist; \ - mkdir -p debian/$$pkg/lib/systemd/system; \ - ln -s /dev/null debian/$$pkg/lib/systemd/system/sudo.service; \ + mkdir -p debian/$$pkg$(deb_systemdsystemunitdir)/; \ + ln -s /dev/null debian/$$pkg$(deb_systemdsystemunitdir)/sudo.service; \ done execute_after_dh_fixperms:
Bug#1059057: trojan: use systemd.pc to place systemd system units
Source: trojan Version: 1.16.0-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs systemd system units, currently into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using systemd.pc to place these files (using pkg-config). This works for unstable today, and also for bookworm, and is safe to do now. Later during the trixie cycle I expect this bug class to raise in priority. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru trojan-1.16.0/debian/changelog trojan-1.16.0/debian/changelog --- trojan-1.16.0/debian/changelog 2020-06-12 21:23:01.0 +0200 +++ trojan-1.16.0/debian/changelog 2023-12-19 21:37:43.0 +0100 @@ -1,3 +1,10 @@ +trojan (1.16.0-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use systemd.pc to place systemd service unit. (Closes: #-1) + + -- Chris Hofstaedtler Tue, 19 Dec 2023 21:37:43 +0100 + trojan (1.16.0-1) unstable; urgency=medium * New upstream release 1.16.0. diff -Nru trojan-1.16.0/debian/control trojan-1.16.0/debian/control --- trojan-1.16.0/debian/control 2020-06-12 21:23:01.0 +0200 +++ trojan-1.16.0/debian/control 2023-12-19 21:37:29.0 +0100 @@ -2,7 +2,7 @@ Section: web Priority: optional Maintainer: GreaterFire -Build-Depends: debhelper-compat (= 12), cmake (>= 3.7.2), libboost-system-dev, libboost-program-options-dev, libssl-dev, default-libmysqlclient-dev, openssl, python3:any, curl, netcat-openbsd +Build-Depends: debhelper-compat (= 12), cmake (>= 3.7.2), libboost-system-dev, libboost-program-options-dev, libssl-dev, default-libmysqlclient-dev, openssl, python3:any, curl, netcat-openbsd, pkgconf, systemd-dev Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/debian/trojan Vcs-Git: https://salsa.debian.org/debian/trojan.git diff -Nru trojan-1.16.0/debian/rules trojan-1.16.0/debian/rules --- trojan-1.16.0/debian/rules 2020-06-12 21:23:01.0 +0200 +++ trojan-1.16.0/debian/rules 2023-12-19 21:37:43.0 +0100 @@ -9,7 +9,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DSYSTEMD_SERVICE=ON + dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DSYSTEMD_SERVICE=ON -DSYSTEMD_SERVICE_PATH=$(shell pkg-config --variable=systemdsystemunitdir systemd) override_dh_auto_test: dh_auto_test --no-parallel
Bug#1059014: stunnel4: please make the build reproducible
Source: stunnel4 Version: 3:5.70-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0], we noticed that stunnel4 could not be built reproducibly. This is because the stunnel manpage embedded the current build date. A patch is attached that seeds this value from SOURCE_DATE_EPOCH if it is available. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/07-reproducible-build.patch1970-01-01 01:00:00.0 +0100 --- b/debian/patches/07-reproducible-build.patch2023-12-19 10:10:27.992405010 + @@ -0,0 +1,19 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2023-12-19 + +--- stunnel4-5.70.orig/doc/Makefile.am stunnel4-5.70/doc/Makefile.am +@@ -14,9 +14,11 @@ DISTCLEANFILES = $(doc_DATA) + + SUFFIXES = .pod.in .8.in .html.in + ++BUILD_DATE = $(shell date --utc --date=@$(or $(SOURCE_DATE_EPOCH),$(shell date +%s)) +%Y.%m.%d) ++ + .pod.in.8.in: + pod2man -u -n stunnel -s 8 -r $(VERSION) \ +- -c "stunnel4 TLS Proxy" -d `date +%Y.%m.%d` $< $@ ++ -c "stunnel4 TLS Proxy" -d $(BUILD_DATE) $< $@ + + .pod.in.html.in: + pod2html --index --backlink --header \ --- a/debian/patches/series 2023-12-19 09:51:42.220785283 + --- b/debian/patches/series 2023-12-19 10:00:22.317767514 + @@ -3,3 +3,4 @@ 03-runas-user.patch 05-sample-sysconfdir.patch 06-no-openssl-version-check-autopkgtest.patch +07-reproducible-build.patch
Bug#1059013: wxmplot: please make the build reproducible
Source: wxmplot
Version: 0.9.58-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0], we noticed that
wxmplot could not be built reproducibly.
This is because it embedded the current build date in the manual
pages. Patch attached that seeds this value from SOURCE_DATE_EPOCH if
available.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/0003-reproducible-build.patch 1970-01-01
01:00:00.0 +0100
--- b/debian/patches/0003-reproducible-build.patch 2023-12-19
09:55:20.149244757 +
@@ -0,0 +1,29 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2023-12-19
+
+--- wxmplot-0.9.58.orig/doc/conf.py
wxmplot-0.9.58/doc/conf.py
+@@ -7,15 +7,20 @@
+ # serve to show the default.
+
+ import os
++import time
+ import sys
+-from datetime import date
+
+ from packaging.version import parse as version_parse
+
+ import wxmplot
+
++date_str = time.strftime(
++"%Y-%m-%d",
++time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time(
++)
++
+ project = 'wxmplot'
+-copyright = f'{date.today()}, Matthew Newville, The University of Chicago'
++copyright = f'{date_str}, Matthew Newville, The University of Chicago'
+
+ release = version_parse(wxmplot.__version__).public
+
--- a/debian/patches/series 2023-12-19 09:51:50.852805288 +
--- b/debian/patches/series 2023-12-19 09:55:19.281243090 +
@@ -1,2 +1,3 @@
sphinx_support_mathjax.patch
0002-removed-sphinxcontrib.video-extension.patch
+0003-reproducible-build.patch
Bug#1054485: postfix: diff for NMU version 3.8.2-1.1
Control: tags 1054485 + patch
Control: tags 1054485 + pending
Dear maintainer,
I've prepared an NMU for postfix (versioned as 3.8.2-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer. Better, upload yourself in the meantime.
Best,
Chris
diff -Nru postfix-3.8.2/debian/changelog postfix-3.8.2/debian/changelog
--- postfix-3.8.2/debian/changelog 2023-09-14 20:08:10.0 +0200
+++ postfix-3.8.2/debian/changelog 2023-12-19 01:24:10.0 +0100
@@ -1,3 +1,13 @@
+postfix (3.8.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [Helmut Grohne]
+
+ * Install units using dh_installsystemd only. (Closes: #1054485)
+
+ -- Chris Hofstaedtler Tue, 19 Dec 2023 01:24:10 +0100
+
postfix (3.8.2-1) unstable; urgency=medium
[Scott Kitterman]
diff -Nru postfix-3.8.2/debian/postfix.dirs postfix-3.8.2/debian/postfix.dirs
--- postfix-3.8.2/debian/postfix.dirs 2023-09-14 19:53:19.0 +0200
+++ postfix-3.8.2/debian/postfix.dirs 2023-12-19 01:23:16.0 +0100
@@ -34,5 +34,4 @@
var/spool/postfix/usr/lib/sasl2
var/log
var/lib/postfix
-lib/systemd/system
lib/systemd/system-generators
diff -Nru postfix-3.8.2/debian/postfix.postfix-resolvconf.path postfix-3.8.2/debian/postfix.postfix-resolvconf.path
--- postfix-3.8.2/debian/postfix.postfix-resolvconf.path 1970-01-01 01:00:00.0 +0100
+++ postfix-3.8.2/debian/postfix.postfix-resolvconf.path 2023-12-19 01:23:16.0 +0100
@@ -0,0 +1,11 @@
+[Unit]
+Description=Watch for resolv.conf updates and restart postfix
+ConditionPathExists=/etc/resolv.conf
+
+[Path]
+PathChanged=/etc/resolv.conf
+Unit=postfix-resolvconf.service
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru postfix-3.8.2/debian/postfix.postfix-resolvconf.service postfix-3.8.2/debian/postfix.postfix-resolvconf.service
--- postfix-3.8.2/debian/postfix.postfix-resolvconf.service 1970-01-01 01:00:00.0 +0100
+++ postfix-3.8.2/debian/postfix.postfix-resolvconf.service 2023-12-19 01:23:16.0 +0100
@@ -0,0 +1,9 @@
+[Unit]
+Description=Copies updated resolv.conf to postfix chroot and restarts postfix.
+
+[Service]
+Type=simple
+ExecStart=/etc/resolvconf/update-libc.d/postfix
+
+[Install]
+WantedBy=multi-user.target
diff -Nru postfix-3.8.2/debian/postfix-resolvconf.path postfix-3.8.2/debian/postfix-resolvconf.path
--- postfix-3.8.2/debian/postfix-resolvconf.path 2023-09-14 19:53:19.0 +0200
+++ postfix-3.8.2/debian/postfix-resolvconf.path 1970-01-01 01:00:00.0 +0100
@@ -1,11 +0,0 @@
-[Unit]
-Description=Watch for resolv.conf updates and restart postfix
-ConditionPathExists=/etc/resolv.conf
-
-[Path]
-PathChanged=/etc/resolv.conf
-Unit=postfix-resolvconf.service
-
-[Install]
-WantedBy=multi-user.target
-
diff -Nru postfix-3.8.2/debian/postfix-resolvconf.service postfix-3.8.2/debian/postfix-resolvconf.service
--- postfix-3.8.2/debian/postfix-resolvconf.service 2023-09-14 19:53:19.0 +0200
+++ postfix-3.8.2/debian/postfix-resolvconf.service 1970-01-01 01:00:00.0 +0100
@@ -1,9 +0,0 @@
-[Unit]
-Description=Copies updated resolv.conf to postfix chroot and restarts postfix.
-
-[Service]
-Type=simple
-ExecStart=/etc/resolvconf/update-libc.d/postfix
-
-[Install]
-WantedBy=multi-user.target
diff -Nru postfix-3.8.2/debian/rules postfix-3.8.2/debian/rules
--- postfix-3.8.2/debian/rules 2023-09-14 19:53:19.0 +0200
+++ postfix-3.8.2/debian/rules 2023-12-19 01:23:16.0 +0100
@@ -193,8 +193,6 @@
install debian/configure-instance.sh $(libdir)
install debian/postfix-instance-generator ${base}/lib/systemd/system-generators/
- install -m 644 debian/postfix@.service ${base}/lib/systemd/system/
- install -m 644 debian/postfix-resolvconf.* ${base}/lib/systemd/system/
install debian/ip-up.d ${base}/etc/ppp/ip-up.d/postfix
install debian/ip-down.d ${base}/etc/ppp/ip-down.d/postfix
install debian/ip-up.d ${base}/etc/network/if-up.d/postfix
@@ -209,8 +207,7 @@
fi
override_dh_installsystemd:
- dh_installsystemd -p postfix --no-enable --no-start postfix-resolvconf.path
- dh_installsystemd -p postfix --no-enable --no-start postfix-resolvconf.service
+ dh_installsystemd -p postfix --no-enable --no-start --name postfix-resolvconf
dh_installsystemd -p postfix --no-restart-after-upgrade postfix.service
execute_before_dh_gencontrol:
Bug#1051460: crowdsec-custom-bouncer: move systemd units to /usr
Hi Cyril, On Fri, Dec 08, 2023 at 10:48:59PM +0100, Cyril Brulebois wrote: > Chris Hofstaedtler (2023-12-08): > > Can we help you out in any way to get the systemd units moved? It's > > not so "early stage" anymore and the systemd units can certainly > > move now. > > I haven't been able to keep up with the state of this transition (having > been busy with other topics that have been a blocker for it). I hear you. > If it's safe to move things around, I can handle that. At least that > particular subject line from last week didn't seem encouraging: > Subject: Pause /usr-merge moves > See https://lists.debian.org/20231201210412.ga1344...@subdivi.de Indeed, the concerns around these parts are a worry. If you can reasonably expect that the package in question will not change name, or split out or move the systemd unit files in any other way, than strictly from /lib to /usr/lib, then this is safe to do now. Conversely, if you expect the package to change name, split out the systemd unit files into another package, or otherwise move them around, please do not move them now. If the only things 'blocking' this bug is your time and/or uncertainty about the situation right now, then this is also a good to know datapoint. I'm sorry that there are no easy (to read or otherwise) answers now, and I also don't expect them to show up in the future :-/ Best, Chris
Bug#1058933: cubemap: introduced new file in /lib
* Steinar H. Gunderson [231218 17:19]:
> On Mon, Dec 18, 2023 at 04:33:26PM +0100, Chris Hofstaedtler wrote:
> > I don't think there is anything you can "ask" about this.
> >
> > Generally the idea is that in trixie and later, --prefix=/usr really
> > means that. Anything that excluded subdirs from ${prefix} should be
> > a thing of the past. If the upstream build system ignores ${prefix}
> > for a certain location, you'll need to override it :-(
>
> Well, it's pretty straight-up autoconf (no automake). Makefile.in contains
>
> PREFIX=@prefix@
> SYSCONFDIR=@sysconfdir@
> LOCALSTATEDIR=@localstatedir@
> LIBDIR=@libdir@
>
> and installs into $(LIBDIR).
>
> dh_auto_configure runs configure with (among others)
>
> --prefix=/usr --libdir=\${prefix}/lib/x86_64-linux-gnu
>
> But nothing ever defines lowercase ${prefix}. It's possible that it expects
> the upstream Makefile to do
>
> prefix=$(PREFIX)
I think thats what dh expects it to contain for everything to work,
yes. You could check out the "hello" source package, which has a bog
standard autoconf/automake setup and has, in Makefile.in:
...
libdir = @libdir@
...
prefix = @prefix@
...
and thus in Makefile:
...
libdir = ${prefix}/lib/x86_64-linux-gnu
...
prefix = /usr
...
> or something similar? But it's unclear to my why it doesn't just do
>
> --libdir=/usr/lib/x86_64-linux-gnu
Good question, don't know. There is no comment explaining this in
the debhelper source; maybe it was to avoid duplication there.
Maybe the easiest is to add --libdir=/usr/lib/${DEB_HOST_MULTIARCH}
to dh_auto_configure?
Best,
Chris
Bug#1017780: 1.5.517 in salsa repository [was: Version bump: 1.4.230]
Hello Sven, thank you for your quick response. On 12/18/23 03:57, Sven Hartge wrote: On 18.12.23 07:37, Chris Knadle wrote: Thank you very much for your efforts on this bug. Most the changes the patches make and offhand look reasonable, and for the moment I've pulled them from the 'improvement' branch your mumble Git repo. However I'm wondering about the permissions change to /etc/mumble as to why that's desired: chown root:mumble-server /etc/mumble/ What is the benefit of updating the /etc/mumble/ directory to have group ownership by mumble-server? Is the intent for allowing a number of users that are added to the mumble-server group to be allowed to update the mumble-server.ini file? Let me know so I can explain it. ;-) The problem is access to the configuration. If /etc/mumble is root:root and 750, then the daemon, running as mumble-server:mumble-server can't read its configuration file and fails to start. Okay, right, because there are no "other" read or execute permissions to allow traversing the directory. So /etc/mumble needs to be readable by the group, either 755 (which is worse security-wise) or owned by the group, which is the change I implemented. The configuration file itself is 640 and root:mumble-server, so the group can't change it. Accepted. Grüße, Sven. Grüße. Thanks -- Chris Knadle chris.kna...@coredump.us
Bug#1058933: cubemap: introduced new file in /lib
* Steinar H. Gunderson [231218 16:07]:
> On Mon, Dec 18, 2023 at 03:28:54PM +0100, Chris Hofstaedtler wrote:
> > cubemap 1.5.1-1 introduced a new file into
> > /lib/${DEB_HOST_MULTIARCH}. This is diametral to the ongoing
> > UsrMerge effort [1].
>
> Can you say something about where I should get libdir from?
> Some dpkg invocation?
I don't think there is anything you can "ask" about this.
Generally the idea is that in trixie and later, --prefix=/usr really
means that. Anything that excluded subdirs from ${prefix} should be
a thing of the past. If the upstream build system ignores ${prefix}
for a certain location, you'll need to override it :-(
Best,
Chris
Bug#1058933: cubemap: introduced new file in /lib
Package: cubemap
Version: 1.5.1-1
User: helm...@debian.org
Usertags: dep17m2
Severity: important
Hello!
cubemap 1.5.1-1 introduced a new file into
/lib/${DEB_HOST_MULTIARCH}. This is diametral to the ongoing
UsrMerge effort [1].
This having already happened in unstable is somewhat unfortunate,
because it now presents extra work.
As long as this has not reached testing, the easiest thing to do
would be:
Immediately upload a new version of cubemap, which fulfills all of:
1) install ffmpeg_metacube_hack.so into /usr/lib/${DEB_HOST_MULTIARCH}
2) stop creating /lib/${DEB_HOST_MULTIARCH}
3) does exactly no other changes
and let that migrate, and then we can pretend this never happened.
If for some reason this timing is not possible, I would encourage
you to do all of the following:
Upload a new version of cubemap to *experimental* which:
1) installs ffmpeg_metacube_hack.so into /usr/lib/${DEB_HOST_MULTIARCH}
2) stops creating /lib/${DEB_HOST_MULTIARCH}
and let it stay in experimental for a few days, so dumat[1] and
humans can analyze the change.
In addition, if src:cubemap will introduce any other changes during
the trixie cycle (file moves, package renames, splits, any other
reorganization), please also upload to experimental for the same
benefit as above.
Thanks,
Chris
[1] https://wiki.debian.org/UsrMerge
Bug#1058921: ceph: loss of ceph-volume@.service
Source: ceph Version: 18.2.0+ds-1 Severity: serious User: helm...@debian.org Usertags: dep17p1 X-Debbugs-Cc: helm...@debian.org Hi, the file /lib/systemd/system/ceph-volume@.service was previously part of the ceph-osd binary package, but has now moved to ceph-volume. However, this file will also need to move from /lib to /usr/lib during trixie. This combination will become a DEP17 P1 problem: "File loss during canonicalized file move", and is currently prohibited by the file move moratorium. As an effect, it is likely the ceph-volume@.service will be lost in some percentage of upgrades. There are potential mitigations if this file move needs to happen, but they are hard to understand and therefore even harder to test. It would be easier for everyone, if this file move could be avoided altogether. I'm therefore asking you to consider not moving the file between binary packages. If you come to the conclusion that the file must be moved, please reply on this bug report and keep the problem confined to experimental for now. Thanks, Chris
Bug#1017780: 1.5.517 in salsa repository [was: Version bump: 1.4.230]
Hello Sven. Thank you very much for your efforts on this bug. Most the changes the patches make and offhand look reasonable, and for the moment I've pulled them from the 'improvement' branch your mumble Git repo. However I'm wondering about the permissions change to /etc/mumble as to why that's desired: chown root:mumble-server /etc/mumble/ What is the benefit of updating the /etc/mumble/ directory to have group ownership by mumble-server? Is the intent for allowing a number of users that are added to the mumble-server group to be allowed to update the mumble-server.ini file? Let me know so I can explain it. ;-) Thanks On 12/8/23 11:36, Sven Hartge wrote: On Fri, 3 Mar 2023 06:16:00 + Chris Knadle wrote: If someone knows how to fix the mumble-server.service file so that mumble-server can start, that would be helpful; once that's fixed I can make an upload to Debian Experimental. The file in the tree is at: Hello Chris, I looked at the problem and I fixed all the problems (and some more) preventing the daemon to start under systemd. You can either pull from https://salsa.debian.org/hartge/mumble.git or apply the attached diff. I tested my changes for fresh installations and upgrades, both work correctly. These changes fix #1039271 as well. Grüße, Sven. -- Chris Knadle chris.kna...@coredump.us
Bug#1054012: at: diff for NMU version 3.2.5-2.1
Control: tags 1054012 + patch Control: tags 1054012 + pending Hi Jose, thanks for your answer. I've prepared an NMU for at (versioned as 3.2.5-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. I'll also push to a branch (nmu-3.2.5-2.1) on salsa. Best, Chris diff -Nru at-3.2.5/debian/changelog at-3.2.5/debian/changelog --- at-3.2.5/debian/changelog 2023-06-25 23:46:36.0 +0200 +++ at-3.2.5/debian/changelog 2023-12-18 03:33:04.0 +0100 @@ -1,3 +1,12 @@ +at (3.2.5-2.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Helmut Grohne ] + * Defer placement of systemd units to systemd.pc. (Closes: #1054012) + + -- Chris Hofstaedtler Mon, 18 Dec 2023 03:33:04 +0100 + at (3.2.5-2) unstable; urgency=medium * Fix a race condition on DEP8 test? diff -Nru at-3.2.5/debian/control at-3.2.5/debian/control --- at-3.2.5/debian/control 2023-06-25 23:46:36.0 +0200 +++ at-3.2.5/debian/control 2023-12-18 03:33:04.0 +0100 @@ -12,6 +12,8 @@ libpam0g-dev, libselinux1-dev [linux-any], perl:any (>= 5.10.1), + pkgconf, + systemd-dev, Vcs-Browser: https://salsa.debian.org/debian/at Vcs-Git: https://salsa.debian.org/debian/at.git -b debian Homepage: http://blog.calhariz.com diff -Nru at-3.2.5/debian/rules at-3.2.5/debian/rules --- at-3.2.5/debian/rules 2023-06-25 23:46:36.0 +0200 +++ at-3.2.5/debian/rules 2023-12-18 03:33:04.0 +0100 @@ -9,7 +9,7 @@ confflags = --with-loadavg_mx=1.5 \ --with-jobdir=/var/spool/cron/atjobs \ --with-atspool=/var/spool/cron/atspool \ ---with-systemdsystemunitdir=/lib/systemd/system \ +--with-systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd) \ $(WITH_SELINUX) \ SENDMAIL=/usr/sbin/sendmail
Bug#1058643: dnsdist: re-enable 32-bit support via _TIME_BITS=64
On Thu, Dec 14, 2023 at 12:06:59AM +, Matija Nalis wrote: > So, all that is needed for dnsdist on 32-bit platform (like my Rasperry Pi > armhf, where I tested that solution, and it compiles and runs just fine, > both versions 1.7.3-2 and 1.8.2-3) is: > > export DEB_CXXFLAGS_APPEND="-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64" > (and skipping dependency on architecture-is-64-bit, of course). My understanding is, doing this on an individual package level, is not safe in any way. It might work when the stars align correctly, but there are zero guarantees for anything. I think we'll wait at the very least until Debian finishes the t64 transition, and then we'll see what to do about 32bit archs. In the meantime, dnsdist works on arm64, also on Raspberrys! Chris
Bug#1058860: squid: installs an empty /lib/systemd/system
Source: squid Version: 6.5-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, for the ongoing UsrMerge effort [1], systemd.pc and dh_installsystemd were changed to place units into /usr/lib/systemd/system. Now your package installs an empty directory /lib/systemd/system. Please stop shipping this directory. For your convenience, a possible patch is attached. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru squid-6.5/debian/changelog squid-6.5/debian/changelog --- squid-6.5/debian/changelog 2023-11-09 15:04:20.0 +0100 +++ squid-6.5/debian/changelog 2023-12-17 02:40:41.0 +0100 @@ -1,3 +1,10 @@ +squid (6.5-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Stop creating empty /lib/systemd/system directory. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 02:40:41 +0100 + squid (6.5-1) unstable; urgency=high [ Amos Jeffries ] diff -Nru squid-6.5/debian/squid-openssl.dirs squid-6.5/debian/squid-openssl.dirs --- squid-6.5/debian/squid-openssl.dirs 2023-11-09 15:04:20.0 +0100 +++ squid-6.5/debian/squid-openssl.dirs 1970-01-01 01:00:00.0 +0100 @@ -1 +0,0 @@ -/lib/systemd/system \ No newline at end of file
Bug#1058859: teensy-loader-cli: use udev.pc to place udev rules
Source: teensy-loader-cli
Version: 2.2-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru teensy-loader-cli-2.2/debian/49-teensy.rules teensy-loader-cli-2.2/debian/49-teensy.rules
--- teensy-loader-cli-2.2/debian/49-teensy.rules 2022-01-11 14:30:43.0 +0100
+++ teensy-loader-cli-2.2/debian/49-teensy.rules 1970-01-01 01:00:00.0 +0100
@@ -1,38 +0,0 @@
-# UDEV Rules for Teensy boards, http://www.pjrc.com/teensy/
-#
-# The latest version of this file may be found at:
-# http://www.pjrc.com/teensy/49-teensy.rules
-#
-# This file must be placed at:
-#
-# /etc/udev/rules.d/49-teensy.rules(preferred location)
-# or
-# /lib/udev/rules.d/49-teensy.rules(req'd on some broken systems)
-#
-# To install, type this command in a terminal:
-# sudo cp 49-teensy.rules /etc/udev/rules.d/49-teensy.rules
-#
-# Or use the alternate way (from this forum message) to download and install:
-# https://forum.pjrc.com/threads/45595?p=150445=1#post150445
-#
-# After this file is installed, physically unplug and reconnect Teensy.
-#
-ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
-ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", TAG+="uaccess", TAG+="udev-acl"
-KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", TAG+="uaccess", TAG+="udev-acl"
-#
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
-#
-#
-# If using USB Serial you get a new device each time (Ubuntu 9.10)
-# eg: /dev/ttyACM0, ttyACM1, ttyACM2, ttyACM3, ttyACM4, etc
-#apt-get remove --purge modemmanager (reboot may be necessary)
-#
-# Older modem proding (eg, Ubuntu 9.04) caused very slow serial device detection.
-# To fix, add this near top of /lib/udev/rules.d/77-nm-probe-modem-capabilities.rules
-# SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789]?", GOTO="nm_modem_probe_end"
-#
diff -Nru teensy-loader-cli-2.2/debian/changelog teensy-loader-cli-2.2/debian/changelog
--- teensy-loader-cli-2.2/debian/changelog 2022-01-15 21:59:54.0 +0100
+++ teensy-loader-cli-2.2/debian/changelog 2023-12-16 23:07:45.0 +0100
@@ -1,3 +1,10 @@
+teensy-loader-cli (2.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Let dh_installudev install udev rules. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:07:45 +0100
+
teensy-loader-cli (2.2-1) unstable; urgency=medium
* New upstream release, contained all debian patches
diff -Nru teensy-loader-cli-2.2/debian/install teensy-loader-cli-2.2/debian/install
--- teensy-loader-cli-2.2/debian/install 2022-01-11 14:30:43.0 +0100
+++ teensy-loader-cli-2.2/debian/install 2023-12-16 23:07:45.0 +0100
@@ -1,2 +1 @@
teensy_loader_cli /usr/bin/
-debian/49-teensy.rules /lib/udev/rules.d/
diff -Nru teensy-loader-cli-2.2/debian/rules teensy-loader-cli-2.2/debian/rules
--- teensy-loader-cli-2.2/debian/rules 2022-01-11 14:30:43.0 +0100
+++ teensy-loader-cli-2.2/debian/rules 2023-12-16 23:07:45.0 +0100
@@ -12,3 +12,6 @@
%:
dh $@
+
+override_dh_installudev:
+ dh_installudev --priority=49 --name=teensy
diff -Nru teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev
--- teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev 1970-01-01 01:00:00.0 +0100
+++ teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev 2022-01-11 14:30:43.0 +0100
@@ -0,0 +1,38 @@
+# UDEV Rules for Teensy boards, http://www.pjrc.com/teensy/
+#
+# The latest version of this file may be found at:
+# http://www.pjrc.com/teensy/49-teensy.rul
Bug#1058858: switcheroo-control: let meson use pkg-config to place files
Source: switcheroo-control Version: 2.6-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev and systemd, both into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. The upstream build system can use pkg-config to detect the correct install locations. A patch is attached implementing this. This works today in unstable and also for bookworm, and is safe to do now. Additional info: currently in unstable, systemd.pc is already changed. udev.pc will follow shortly. Once this happens, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru switcheroo-control-2.6/debian/changelog switcheroo-control-2.6/debian/changelog --- switcheroo-control-2.6/debian/changelog 2022-08-25 05:34:40.0 +0200 +++ switcheroo-control-2.6/debian/changelog 2023-12-17 02:43:37.0 +0100 @@ -1,3 +1,10 @@ +switcheroo-control (2.6-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Let meson use pkg-config to place udev/systemd files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 02:43:37 +0100 + switcheroo-control (2.6-1) unstable; urgency=medium * New upstream release diff -Nru switcheroo-control-2.6/debian/control switcheroo-control-2.6/debian/control --- switcheroo-control-2.6/debian/control 2022-08-25 05:34:40.0 +0200 +++ switcheroo-control-2.6/debian/control 2023-12-17 02:43:37.0 +0100 @@ -19,6 +19,7 @@ python3-gi, python3-dbus, python3-dbusmock, + systemd-dev, udev, umockdev, Standards-Version: 4.6.1 diff -Nru switcheroo-control-2.6/debian/control.in switcheroo-control-2.6/debian/control.in --- switcheroo-control-2.6/debian/control.in 2022-08-25 05:34:40.0 +0200 +++ switcheroo-control-2.6/debian/control.in 2023-12-17 02:42:36.0 +0100 @@ -15,6 +15,7 @@ python3-gi, python3-dbus, python3-dbusmock, + systemd-dev, udev, umockdev, Standards-Version: 4.6.1 diff -Nru switcheroo-control-2.6/debian/rules switcheroo-control-2.6/debian/rules --- switcheroo-control-2.6/debian/rules 2022-08-25 05:34:40.0 +0200 +++ switcheroo-control-2.6/debian/rules 2023-12-17 02:43:11.0 +0100 @@ -9,8 +9,6 @@ override_dh_auto_configure: dh_auto_configure -- \ -Dgtk_doc=false \ - -Dsystemdsystemunitdir=/lib/systemd/system \ - -Dhwdbdir=/lib/udev/hwdb.d \ -Dtests=true execute_before_dh_install:
Bug#1058857: alsa-tools: use udev.pc to place udev rules and helpers
Source: alsa-tools
Version: 1.2.5-3
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
Given I don't have any of the relevant hardware, this is obviously
untested. It _looks_ good though.
The patch also changes the firmware path to /usr/lib/firmware, to
avoid another upload. On merged systems (= anything bookworm or
newer), this should be a harmless change.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru alsa-tools-1.2.5/debian/alsa-firmware-loaders.dirs alsa-tools-1.2.5/debian/alsa-firmware-loaders.dirs
--- alsa-tools-1.2.5/debian/alsa-firmware-loaders.dirs 2019-11-07 00:42:01.0 +0100
+++ alsa-tools-1.2.5/debian/alsa-firmware-loaders.dirs 1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-/lib/udev/rules.d
diff -Nru alsa-tools-1.2.5/debian/alsa-firmware-loaders.udev alsa-tools-1.2.5/debian/alsa-firmware-loaders.udev
--- alsa-tools-1.2.5/debian/alsa-firmware-loaders.udev 2021-09-09 02:44:36.0 +0200
+++ alsa-tools-1.2.5/debian/alsa-firmware-loaders.udev 2023-12-17 01:36:02.0 +0100
@@ -1,18 +1,18 @@
###
# Description: udev rule to load TASCAM US-122 usb sound card.
# Created: Wed, 12 Sep 2007 17:05:25 +0200
-# Last modified: Thu, 21 Jan 2010 21:21:12 +0100
+# Last modified: Sun, 17 Dec 2023 01:35:53 +0100
# File: /etc/udev/alsa-firmware-loaders.rules
###
# TASCAM US-428 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8000", RUN+="/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8000", RUN+="tascam_fw"
# TASCAM US-224 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8004", RUN+="/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8004", RUN+="tascam_fw"
# TASCAM US-112 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8006", RUN+="/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8006", RUN+="tascam_fw"
-SUBSYSTEM=="usb", ACTION=="add", ATTR{id}=="USX2Y", RUN+="/lib/udev/tascam_fpga"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{id}=="USX2Y", RUN+="tascam_fpga"
# vim:tw=160:syntax=udevrules
diff -Nru alsa-tools-1.2.5/debian/changelog alsa-tools-1.2.5/debian/changelog
--- alsa-tools-1.2.5/debian/changelog 2023-05-05 00:35:19.00000 +0200
+++ alsa-tools-1.2.5/debian/changelog 2023-12-17 01:37:30.0 +0100
@@ -1,3 +1,13 @@
+alsa-tools (1.2.5-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+ * Avoid hard-coding path to udev helpers in udev rules, as it will
+change.
+ * Update firmware path to /usr/lib/firmware.
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 01:37:30 +0100
+
alsa-tools (1.2.5-3) unstable; urgency=medium
* Drop changelog.ALSA.
diff -Nru alsa-tools-1.2.5/debian/control alsa-tools-1.2.5/debian/control
--- alsa-tools-1.2.5/debian/control 2023-05-05 00:30:53.0 +0200
+++ alsa-tools-1.2.5/debian/control 2023-12-17 01:37:13.0 +0100
@@ -10,7 +10,9 @@
libasound2-dev (>= 1.0.24.1),
libfltk1.3-dev,
libgtk-3-dev,
- libgtk2.0-dev
+ libgtk2.0-dev,
+ pkgconf,
+ systemd-dev,
Standards-Version: 4.6.0
Homepage: https://www.alsa-project.org/
Vcs-Git: https://salsa.debian.org/alsa-team/alsa-tools.git
diff -Nru alsa-tools-1.2.5/debian/patches/firmware_locations.patch alsa-tools-1.2.5/debian/patches/firmware_locations.patch
--- alsa-tools-1.2.5/debian/patches/firmware_locations.patch 2021-09-09
Bug#1058856: mbpfan: installs an empty /lib/systemd/system
Source: mbpfan Version: 2.3.0-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, for the ongoing UsrMerge effort [1], systemd.pc and dh_installsystemd were changed to place units into /usr/lib/systemd/system. Now your package installs an empty directory /lib/systemd/system. Please stop shipping this directory. For your convenience, a possible patch is attached. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru mbpfan-2.3.0/debian/changelog mbpfan-2.3.0/debian/changelog --- mbpfan-2.3.0/debian/changelog 2022-03-07 08:07:58.0 +0100 +++ mbpfan-2.3.0/debian/changelog 2023-12-17 02:33:28.0 +0100 @@ -1,3 +1,10 @@ +mbpfan (2.3.0-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Stop creating empty /lib/systemd/system directory. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 02:33:28 +0100 + mbpfan (2.3.0-1) unstable; urgency=medium * [036cff0] New upstream version 2.3.0 diff -Nru mbpfan-2.3.0/debian/patches/Makefile-stop-creating-empty-dir.patch mbpfan-2.3.0/debian/patches/Makefile-stop-creating-empty-dir.patch --- mbpfan-2.3.0/debian/patches/Makefile-stop-creating-empty-dir.patch 1970-01-01 01:00:00.0 +0100 +++ mbpfan-2.3.0/debian/patches/Makefile-stop-creating-empty-dir.patch 2023-12-17 02:33:01.0 +0100 @@ -0,0 +1,12 @@ +Index: mbpfan-2.3.0/Makefile +=== +--- mbpfan-2.3.0.orig/Makefile mbpfan-2.3.0/Makefile +@@ -59,7 +59,6 @@ uninstall: + install: all + install -d $(DESTDIR)/usr/sbin + install -d $(DESTDIR)/etc +- install -d $(DESTDIR)/lib/systemd/system + install -d $(DESTDIR)/usr/share/doc/mbpfan + install $(BIN) $(DESTDIR)/usr/sbin + install -m644 $(CONF) $(DESTDIR)/etc diff -Nru mbpfan-2.3.0/debian/patches/series mbpfan-2.3.0/debian/patches/series --- mbpfan-2.3.0/debian/patches/series 2022-03-07 08:07:58.0 +0100 +++ mbpfan-2.3.0/debian/patches/series 2023-12-17 02:32:47.0 +0100 @@ -1,3 +1,4 @@ Drop-deprecated-After-syslog.target-from-mbpfan.service.patch Use-CPPFLAGS-during-compile-step.patch Move-PIDFile-to-run-mbpfan.pid.patch +Makefile-stop-creating-empty-dir.patch
Bug#1058855: concordance: use udev.pc to place udev rules
Source: concordance
Version: 1.5-2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru concordance-1.5/debian/changelog concordance-1.5/debian/changelog
--- concordance-1.5/debian/changelog 2022-04-29 00:28:56.0 +0200
+++ concordance-1.5/debian/changelog 2023-12-17 01:30:14.0 +0100
@@ -1,3 +1,10 @@
+concordance (1.5-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 01:30:14 +0100
+
concordance (1.5-2) unstable; urgency=medium
* Update Standards-Version to 4.6.0 (no changes needed)
diff -Nru concordance-1.5/debian/concordance-common.install concordance-1.5/debian/concordance-common.install
--- concordance-1.5/debian/concordance-common.install 2018-05-08 05:16:38.0 +0200
+++ concordance-1.5/debian/concordance-common.install 2023-12-17 01:30:14.0 +0100
@@ -1,2 +1,2 @@
-lib/udev
+${env:UDEVDIR}
debian/concordance.metainfo.xml /usr/share/metainfo
diff -Nru concordance-1.5/debian/control concordance-1.5/debian/control
--- concordance-1.5/debian/control 2022-04-29 00:27:00.0 +0200
+++ concordance-1.5/debian/control 2023-12-17 01:28:33.0 +0100
@@ -14,6 +14,7 @@
pkg-config,
python3-all-dev,
python3-setuptools,
+ systemd-dev,
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian/concordance
Vcs-Git: https://salsa.debian.org/debian/concordance.git
diff -Nru concordance-1.5/debian/patches/Makefile-UDEVDIR.patch concordance-1.5/debian/patches/Makefile-UDEVDIR.patch
--- concordance-1.5/debian/patches/Makefile-UDEVDIR.patch 1970-01-01 01:00:00.0 +0100
+++ concordance-1.5/debian/patches/Makefile-UDEVDIR.patch 2023-12-17 01:28:15.0 +0100
@@ -0,0 +1,51 @@
+Index: concordance-1.5/libconcord/INSTALL.linux
+===
+--- concordance-1.5.orig/libconcord/INSTALL.linux
concordance-1.5/libconcord/INSTALL.linux
+@@ -116,9 +116,9 @@ to work.
+
+ NOTE:
+ By default udev files will install in /lib/udev. You can override this by setting
+-the UDEVLIBDIR environment variable (as root):
++the UDEVDIR environment variable (as root):
+
+- UDEVLIBDIR=/etc/udev make install_udev
++ UDEVDIR=/etc/udev make install_udev
+
+ The policykit/consolekit files will install in datarootdir which is a subset
+ of prefix, meaning, by default /usr/local/share. This will not work, so if you
+Index: concordance-1.5/libconcord/Makefile.am
+===
+--- concordance-1.5.orig/libconcord/Makefile.am
concordance-1.5/libconcord/Makefile.am
+@@ -9,8 +9,7 @@ include_HEADERS = libconcord.h
+ libconcord_la_CPPFLAGS = -Wall
+ libconcord_la_LDFLAGS = -version-info 6:0:0 $(LIBCONCORD_LDFLAGS) -lzip -lcurl
+ libconcord_la_CXXFLAGS = $(ZIP_CFLAGS)
+-UDEVROOT ?= /
+-UDEVLIBDIR ?= $(UDEVROOT)/lib
++UDEVDIR ?= /lib/udev
+
+ # udev and friends support
+ udev:
+@@ -23,15 +22,15 @@ generic_udev:
+ ./gen_udev_support -g
+
+ install_udev_common:
+- $(MKDIR_P) $(DESTDIR)$(UDEVLIBDIR)/udev/rules.d
++ $(MKDIR_P) $(DESTDIR)$(UDEVDIR)/rules.d
+ $(install_sh_DATA) libconcord.rules \
+- $(DESTDIR)$(UDEVLIBDIR)/udev/rules.d/60-libconcord.rules
++ $(DESTDIR)$(UDEVDIR)/rules.d/60-libconcord.rules
+ $(install_sh_DATA) libconcord-usbnet.rules \
+- $(DESTDIR)$(UDEVLIBDIR)/udev/rules.d/80-libconcord-usbnet.rules
++ $(DESTDIR)$(UDEVDIR)/rules.d/80-libconcord-usbnet.rules
+ $(install_sh_SCRIPT) start_concordance_dhcpd.sh \
+- $(DESTDIR)$(UDEVLIBDIR)/udev/
++ $(DESTDIR)$(UDEVDIR)/
+ $(install_sh_SCRIPT) start_concordance_dhcpd_wrapper.sh \
+- $(DESTDIR)$(UDEVLIBDIR)/udev/
++ $(DESTDIR)$(UDEVDIR)/
+
+ install_udev: udev install_udev_common
+ install_old_udev: old_udev install_udev_common
diff -Nru concordance-1.5/debian/patches/series concordance-1.5/debian/patches/series
--- concordance-1.5/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ concordance-1.5/debian/patches/series 2023-12-17 01:26:00.0 +0100
@@ -0,0 +1 @@
+Makefile-UDEVDIR.patch
diff -Nru concordance-1.5/debian/rules concordance-1.5/debian/rules
--- concordance-1.5/debian/rules
Bug#1058854: indi-nightscape: use udev.pc to place udev rules
Source: indi-nightscape Version: 1.0.6+20221222181314-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru indi-nightscape-1.0.6+20221222181314/debian/changelog indi-nightscape-1.0.6+20221222181314/debian/changelog --- indi-nightscape-1.0.6+20221222181314/debian/changelog 2022-12-22 19:14:29.0 +0100 +++ indi-nightscape-1.0.6+20221222181314/debian/changelog 2023-12-17 01:21:04.0 +0100 @@ -1,3 +1,10 @@ +indi-nightscape (1.0.6+20221222181314-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 01:21:04 +0100 + indi-nightscape (1.0.6+20221222181314-1) unstable; urgency=medium * build version from git diff -Nru indi-nightscape-1.0.6+20221222181314/debian/control indi-nightscape-1.0.6+20221222181314/debian/control --- indi-nightscape-1.0.6+20221222181314/debian/control 2022-12-22 19:13:18.0 +0100 +++ indi-nightscape-1.0.6+20221222181314/debian/control 2023-12-17 01:21:01.0 +0100 @@ -11,6 +11,8 @@ , zlib1g-dev , libnova-dev , libftdi1-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru indi-nightscape-1.0.6+20221222181314/debian/rules indi-nightscape-1.0.6+20221222181314/debian/rules --- indi-nightscape-1.0.6+20221222181314/debian/rules 2022-12-22 19:13:18.0 +0100 +++ indi-nightscape-1.0.6+20221222181314/debian/rules 2023-12-17 01:20:46.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058853: indi-gphoto: use udev.pc to place udev rules
Source: indi-gphoto Version: 3.2+20221221172841-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru indi-gphoto-3.2+20221221172841/debian/changelog indi-gphoto-3.2+20221221172841/debian/changelog --- indi-gphoto-3.2+20221221172841/debian/changelog 2022-12-21 18:29:56.0 +0100 +++ indi-gphoto-3.2+20221221172841/debian/changelog 2023-12-17 01:19:33.0 +0100 @@ -1,3 +1,10 @@ +indi-gphoto (3.2+20221221172841-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 01:19:33 +0100 + indi-gphoto (3.2+20221221172841-1) unstable; urgency=medium * build version from git diff -Nru indi-gphoto-3.2+20221221172841/debian/control indi-gphoto-3.2+20221221172841/debian/control --- indi-gphoto-3.2+20221221172841/debian/control 2022-12-21 18:28:45.0 +0100 +++ indi-gphoto-3.2+20221221172841/debian/control 2023-12-17 01:19:31.0 +0100 @@ -13,6 +13,8 @@ , libcfitsio-dev , libgphoto2-dev , libraw-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru indi-gphoto-3.2+20221221172841/debian/rules indi-gphoto-3.2+20221221172841/debian/rules --- indi-gphoto-3.2+20221221172841/debian/rules 2022-12-21 18:28:45.0 +0100 +++ indi-gphoto-3.2+20221221172841/debian/rules 2023-12-17 01:19:19.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058852: indi-ffmv: use udev.pc to place udev rules
Source: indi-ffmv Version: 0.3+20221223120905-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru indi-ffmv-0.3+20221223120905/debian/changelog indi-ffmv-0.3+20221223120905/debian/changelog --- indi-ffmv-0.3+20221223120905/debian/changelog 2022-12-23 13:10:19.0 +0100 +++ indi-ffmv-0.3+20221223120905/debian/changelog 2023-12-17 01:19:03.0 +0100 @@ -1,3 +1,10 @@ +indi-ffmv (0.3+20221223120905-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 01:19:03 +0100 + indi-ffmv (0.3+20221223120905-1) unstable; urgency=medium * build version from git diff -Nru indi-ffmv-0.3+20221223120905/debian/control indi-ffmv-0.3+20221223120905/debian/control --- indi-ffmv-0.3+20221223120905/debian/control 2022-12-23 13:09:09.0 +0100 +++ indi-ffmv-0.3+20221223120905/debian/control 2023-12-17 01:18:56.0 +0100 @@ -11,6 +11,8 @@ , zlib1g-dev , libnova-dev , libdc1394-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru indi-ffmv-0.3+20221223120905/debian/rules indi-ffmv-0.3+20221223120905/debian/rules --- indi-ffmv-0.3+20221223120905/debian/rules 2022-12-23 13:09:09.0 +0100 +++ indi-ffmv-0.3+20221223120905/debian/rules 2023-12-17 01:19:00.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058851: indi-armadillo-platypus: use udev.pc to place udev rules
Source: indi-armadillo-platypus
Version: 1.0+20221226082641-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
A debian/ patch to align CMakeLists.txt with regard to
UDEVRULES_INSTALL_DIR with the other indi-*/camera libraries is
also included.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru indi-armadillo-platypus-1.0+20221226082641/debian/changelog indi-armadillo-platypus-1.0+20221226082641/debian/changelog
--- indi-armadillo-platypus-1.0+20221226082641/debian/changelog 2022-12-26 09:27:56.0 +0100
+++ indi-armadillo-platypus-1.0+20221226082641/debian/changelog 2023-12-17 01:13:19.0 +0100
@@ -1,3 +1,10 @@
+indi-armadillo-platypus (1.0+20221226082641-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 01:13:19 +0100
+
indi-armadillo-platypus (1.0+20221226082641-1) unstable; urgency=medium
* build version from git
diff -Nru indi-armadillo-platypus-1.0+20221226082641/debian/control indi-armadillo-platypus-1.0+20221226082641/debian/control
--- indi-armadillo-platypus-1.0+20221226082641/debian/control 2022-12-26 09:26:45.0 +0100
+++ indi-armadillo-platypus-1.0+20221226082641/debian/control 2023-12-17 01:13:15.0 +0100
@@ -7,6 +7,8 @@
, cmake
, libindi-dev
, libnova-dev
+ , pkgconf
+ , systemd-dev
Standards-Version: 4.6.0
Homepage: https://github.com/indilib/indi-3rdparty
Rules-Requires-Root: no
diff -Nru indi-armadillo-platypus-1.0+20221226082641/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch indi-armadillo-platypus-1.0+20221226082641/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch
--- indi-armadillo-platypus-1.0+20221226082641/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch 1970-01-01 01:00:00.0 +0100
+++ indi-armadillo-platypus-1.0+20221226082641/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch 2023-12-17 01:13:19.0 +0100
@@ -0,0 +1,22 @@
+Allow overriding udev install location in upstream build system.
+
+Index: indi-armadillo-platypus-1.0+20221226082641/CMakeLists.txt
+===
+--- indi-armadillo-platypus-1.0+20221226082641.orig/CMakeLists.txt
indi-armadillo-platypus-1.0+20221226082641/CMakeLists.txt
+@@ -6,7 +6,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_C
+ include(GNUInstallDirs)
+
+ SET(CMAKE_CXX_STANDARD 11)
+-SET(RULES_INSTALL_DIR "/lib/udev/rules.d/")
++SET(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d/" CACHE PATH "Destination for udev rules")
+
+ find_package(INDI REQUIRED)
+
+@@ -70,5 +70,5 @@ install(TARGETS indi_platypus_focus RUNT
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indi_lunatico.xml DESTINATION ${INDI_DATA_DIR})
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-install(FILES 99-armadilloplatypus.rules DESTINATION ${RULES_INSTALL_DIR})
++install(FILES 99-armadilloplatypus.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
+ endif()
diff -Nru indi-armadillo-platypus-1.0+20221226082641/debian/patches/series indi-armadillo-platypus-1.0+20221226082641/debian/patches/series
--- indi-armadillo-platypus-1.0+20221226082641/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ indi-armadillo-platypus-1.0+20221226082641/debian/patches/series 2023-12-17 01:11:54.0 +0100
@@ -0,0 +1 @@
+CMakeLists-UDEVRULES_INSTALL_DIR.patch
diff -Nru indi-armadillo-platypus-1.0+20221226082641/debian/rules indi-armadillo-platypus-1.0+20221226082641/debian/rules
--- indi-armadillo-platypus-1.0+20221226082641/debian/rules 2022-12-26 09:26:45.0 +0100
+++ indi-armadillo-platypus-1.0+20221226082641/debian/rules 2023-12-17 01:13:02.0 +0100
@@ -2,3 +2,7 @@
%:
dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058850: indi-orion-ssg3: use udev.pc to place udev rules
Source: indi-orion-ssg3
Version: 0.1+20221222180647-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
A debian/ patch to align CMakeLists.txt with regard to
UDEVRULES_INSTALL_DIR with the other indi-*/camera libraries is
also included.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru indi-orion-ssg3-0.1+20221222180647/debian/changelog indi-orion-ssg3-0.1+20221222180647/debian/changelog
--- indi-orion-ssg3-0.1+20221222180647/debian/changelog 2022-12-22 19:08:01.0 +0100
+++ indi-orion-ssg3-0.1+20221222180647/debian/changelog 2023-12-17 01:10:00.0 +0100
@@ -1,3 +1,10 @@
+indi-orion-ssg3 (0.1+20221222180647-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 01:10:00 +0100
+
indi-orion-ssg3 (0.1+20221222180647-1) unstable; urgency=medium
* build version from git
diff -Nru indi-orion-ssg3-0.1+20221222180647/debian/control indi-orion-ssg3-0.1+20221222180647/debian/control
--- indi-orion-ssg3-0.1+20221222180647/debian/control 2022-12-22 19:06:51.0 +0100
+++ indi-orion-ssg3-0.1+20221222180647/debian/control 2023-12-17 01:10:00.0 +0100
@@ -8,6 +8,8 @@
, libusb-1.0-0-dev
, libcfitsio-dev
, libindi-dev
+ , pkgconf
+ , systemd-dev
, zlib1g-dev
, libnova-dev
Standards-Version: 4.6.0
diff -Nru indi-orion-ssg3-0.1+20221222180647/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch indi-orion-ssg3-0.1+20221222180647/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch
--- indi-orion-ssg3-0.1+20221222180647/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch 1970-01-01 01:00:00.0 +0100
+++ indi-orion-ssg3-0.1+20221222180647/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch 2023-12-17 01:10:00.0 +0100
@@ -0,0 +1,23 @@
+Allow overriding udev install location in upstream build system.
+
+Index: indi-orion-ssg3-0.1+20221222180647/CMakeLists.txt
+===
+--- indi-orion-ssg3-0.1+20221222180647.orig/CMakeLists.txt
indi-orion-ssg3-0.1+20221222180647/CMakeLists.txt
+@@ -7,7 +7,7 @@ include(GNUInstallDirs)
+
+ IF(APPLE)
+ ELSE(APPLE)
+-set(RULES_INSTALL_DIR "/lib/udev/rules.d")
++set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE PATH "Destination for udev rules files")
+ ENDIF()
+ set (ORION_SSG3_VERSION_MAJOR 0)
+ set (ORION_SSG3_VERSION_MINOR 1)
+@@ -51,6 +51,6 @@ install(TARGETS indi_orion_ssg3_ccd RUNT
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indi_orion_ssg3.xml DESTINATION ${INDI_DATA_DIR})
+
+ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-install(FILES 99-orionssg3.rules DESTINATION ${RULES_INSTALL_DIR})
++install(FILES 99-orionssg3.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
+ ENDIF()
+
diff -Nru indi-orion-ssg3-0.1+20221222180647/debian/patches/series indi-orion-ssg3-0.1+20221222180647/debian/patches/series
--- indi-orion-ssg3-0.1+20221222180647/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ indi-orion-ssg3-0.1+20221222180647/debian/patches/series 2023-12-17 01:08:59.0 +0100
@@ -0,0 +1 @@
+CMakeLists-UDEVRULES_INSTALL_DIR.patch
diff -Nru indi-orion-ssg3-0.1+20221222180647/debian/rules indi-orion-ssg3-0.1+20221222180647/debian/rules
--- indi-orion-ssg3-0.1+20221222180647/debian/rules 2022-12-22 19:06:51.0 +0100
+++ indi-orion-ssg3-0.1+20221222180647/debian/rules 2023-12-17 01:10:00.0 +0100
@@ -2,3 +2,7 @@
%:
dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058848: comedilib: use udev.pc to place udev rules
Source: comedilib
Version: 0.11.0+5-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru comedilib-0.11.0+5/debian/changelog comedilib-0.11.0+5/debian/changelog
--- comedilib-0.11.0+5/debian/changelog 2020-07-25 10:48:45.0 +0200
+++ comedilib-0.11.0+5/debian/changelog 2023-12-17 01:02:20.0 +0100
@@ -1,3 +1,10 @@
+comedilib (0.11.0+5-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 01:02:20 +0100
+
comedilib (0.11.0+5-1) unstable; urgency=medium
* Add gbp.conf
diff -Nru comedilib-0.11.0+5/debian/control comedilib-0.11.0+5/debian/control
--- comedilib-0.11.0+5/debian/control 2020-07-25 10:48:45.0 +0200
+++ comedilib-0.11.0+5/debian/control 2023-12-17 01:01:53.0 +0100
@@ -17,7 +17,9 @@
libboost-program-options-dev,
libgsl-dev,
python3-all-dev,
- libboost-dev
+ libboost-dev,
+ pkgconf,
+ systemd-dev,
Standards-Version: 4.5.0
Homepage: http://www.comedi.org
Vcs-Git: https://salsa.debian.org/electronics-team/comedilib.git
diff -Nru comedilib-0.11.0+5/debian/libcomedi0.install comedilib-0.11.0+5/debian/libcomedi0.install
--- comedilib-0.11.0+5/debian/libcomedi0.install 2020-07-25 10:48:45.0 +0200
+++ comedilib-0.11.0+5/debian/libcomedi0.install 2023-12-17 01:01:03.0 +0100
@@ -10,5 +10,5 @@
usr/share/man/man8/*
usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
etc/pcmcia/*
-lib/udev/*
+${env:deb_udevdir}/*
diff -Nru comedilib-0.11.0+5/debian/rules comedilib-0.11.0+5/debian/rules
--- comedilib-0.11.0+5/debian/rules 2020-07-25 10:48:45.0 +0200
+++ comedilib-0.11.0+5/debian/rules 2023-12-17 01:02:15.0 +0100
@@ -26,6 +26,8 @@
INSTALL_PROGRAM += -s
endif
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -168,8 +170,8 @@
# do mv $$f $${f%.so}.$$ABITAG.so; done;)
mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
- mkdir -p debian/tmp/lib/udev/rules.d
- cp debian/90-comedi.rules debian/tmp/lib/udev/rules.d/
+ mkdir -p debian/tmp/$(deb_udevdir)/rules.d
+ cp debian/90-comedi.rules debian/tmp/$(deb_udevdir)/rules.d/
chmod 644 debian/tmp/usr/lib/python*/dist-packages/comedi/comedi.py
mkdir -p debian/tmp/usr/share/doc/libcomedi-dev/demo
cp -a demo debian/libcomedi-dev/usr/share/doc/libcomedi-dev
Bug#1058847: indi-sx: use udev.pc to place udev rules
Source: indi-sx
Version: 1.16+20221222162728-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
A patch to the upstream build system is included, to align it
with other, similar libraries.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru indi-sx-1.16+20221222162728/debian/changelog indi-sx-1.16+20221222162728/debian/changelog
--- indi-sx-1.16+20221222162728/debian/changelog 2022-12-22 17:28:43.0 +0100
+++ indi-sx-1.16+20221222162728/debian/changelog 2023-12-17 00:51:23.0 +0100
@@ -1,3 +1,10 @@
+indi-sx (1.16+20221222162728-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 00:51:23 +0100
+
indi-sx (1.16+20221222162728-1) unstable; urgency=medium
* build version from git
diff -Nru indi-sx-1.16+20221222162728/debian/control indi-sx-1.16+20221222162728/debian/control
--- indi-sx-1.16+20221222162728/debian/control 2022-12-22 17:27:33.0 +0100
+++ indi-sx-1.16+20221222162728/debian/control 2023-12-17 00:51:23.0 +0100
@@ -8,6 +8,8 @@
, libusb-1.0-0-dev
, libcfitsio-dev
, libindi-dev
+ , pkgconf
+ , systemd-dev
, zlib1g-dev
, libnova-dev
Standards-Version: 4.6.0
diff -Nru indi-sx-1.16+20221222162728/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch indi-sx-1.16+20221222162728/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch
--- indi-sx-1.16+20221222162728/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch 1970-01-01 01:00:00.0 +0100
+++ indi-sx-1.16+20221222162728/debian/patches/CMakeLists-UDEVRULES_INSTALL_DIR.patch 2023-12-17 00:51:23.0 +0100
@@ -0,0 +1,24 @@
+Allow overriding udev install location in upstream build system.
+
+Index: indi-sx-1.16+20221222162728/CMakeLists.txt
+===
+--- indi-sx-1.16+20221222162728.orig/CMakeLists.txt
indi-sx-1.16+20221222162728/CMakeLists.txt
+@@ -4,7 +4,7 @@ PROJECT(indi_sx CXX C)
+ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
+ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/")
+ include(GNUInstallDirs)
+-set(RULES_INSTALL_DIR "/lib/udev/rules.d/")
++set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d/" CACHE PATH "Destination for udev rules files")
+
+ SET(CMAKE_CXX_STANDARD 11)
+ set (VERSION_MAJOR 1)
+@@ -106,7 +106,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin
+ set (CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
+ set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+- install(FILES 99-sx.rules DESTINATION ${RULES_INSTALL_DIR})
++ install(FILES 99-sx.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
+ set (CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}\n ${CPACK_PACKAGE_DESCRIPTION}")
+ set (CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
+ set (CPACK_GENERATOR "DEB;RPM")
diff -Nru indi-sx-1.16+20221222162728/debian/patches/series indi-sx-1.16+20221222162728/debian/patches/series
--- indi-sx-1.16+20221222162728/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ indi-sx-1.16+20221222162728/debian/patches/series 2023-12-17 00:51:23.0 +0100
@@ -0,0 +1 @@
+CMakeLists-UDEVRULES_INSTALL_DIR.patch
diff -Nru indi-sx-1.16+20221222162728/debian/rules indi-sx-1.16+20221222162728/debian/rules
--- indi-sx-1.16+20221222162728/debian/rules 2022-12-22 17:27:33.0 +0100
+++ indi-sx-1.16+20221222162728/debian/rules 2023-12-17 00:51:23.0 +0100
@@ -2,3 +2,7 @@
%:
dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058846: kinect-audio-setup: use udev.pc to place udev rules
Source: kinect-audio-setup Version: 0.5-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru kinect-audio-setup-0.5/debian/changelog kinect-audio-setup-0.5/debian/changelog --- kinect-audio-setup-0.5/debian/changelog 2016-01-09 18:55:47.0 +0100 +++ kinect-audio-setup-0.5/debian/changelog 2023-12-17 00:48:13.0 +0100 @@ -1,3 +1,10 @@ +kinect-audio-setup (0.5-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:48:13 +0100 + kinect-audio-setup (0.5-1) unstable; urgency=medium * debian: update contact info and copyright dates diff -Nru kinect-audio-setup-0.5/debian/control kinect-audio-setup-0.5/debian/control --- kinect-audio-setup-0.5/debian/control 2016-01-09 18:55:47.0 +0100 +++ kinect-audio-setup-0.5/debian/control 2023-12-17 00:47:59.0 +0100 @@ -6,7 +6,8 @@ Build-Depends: debhelper (>= 9), po-debconf, libusb-1.0-0-dev, - pkg-config + pkg-config, + systemd-dev Standards-Version: 3.9.6 Vcs-Browser: http://git.ao2.it/kinect-audio-setup.git/ Vcs-Git: git://git.ao2.it/kinect-audio-setup.git -b debian diff -Nru kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch --- kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch 1970-01-01 01:00:00.0 +0100 +++ kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch 2023-12-17 00:48:13.0 +0100 @@ -0,0 +1,26 @@ +Index: kinect-audio-setup-0.5/Makefile +=== +--- kinect-audio-setup-0.5.orig/Makefile kinect-audio-setup-0.5/Makefile +@@ -1,3 +1,5 @@ ++UDEVDIR = /lib/udev ++ + all: + $(MAKE) -C kinect_upload_fw + +@@ -5,12 +7,12 @@ install: + $(MAKE) -C kinect_upload_fw install + + install_udev_rules: +- install -d $(DESTDIR)/lib/udev/rules.d +- install -m 644 contrib/55-kinect_audio.rules.in $(DESTDIR)/lib/udev/rules.d/55-kinect_audio.rules ++ install -d $(DESTDIR)$(UDEVDIR)/rules.d ++ install -m 644 contrib/55-kinect_audio.rules.in $(DESTDIR)$(UDEVDIR)/rules.d/55-kinect_audio.rules + ./kinect_patch_udev_rules \ + "$(FIRMWARE_PATH)" \ + "$(LOADER_PATH)" \ +- "$(DESTDIR)/lib/udev/rules.d/55-kinect_audio.rules" ++ "$(DESTDIR)$(UDEVDIR)/rules.d/55-kinect_audio.rules" + + clean: + $(MAKE) -C kinect_upload_fw clean diff -Nru kinect-audio-setup-0.5/debian/patches/series kinect-audio-setup-0.5/debian/patches/series --- kinect-audio-setup-0.5/debian/patches/series 1970-01-01 01:00:00.0 +0100 +++ kinect-audio-setup-0.5/debian/patches/series 2023-12-17 00:47:03.0 +0100 @@ -0,0 +1 @@ +Makefile-udevdir.patch diff -Nru kinect-audio-setup-0.5/debian/rules kinect-audio-setup-0.5/debian/rules --- kinect-audio-setup-0.5/debian/rules 2016-01-09 18:55:47.0 +0100 +++ kinect-audio-setup-0.5/debian/rules 2023-12-17 00:48:08.0 +0100 @@ -10,6 +10,7 @@ dh_auto_install $(MAKE) install_udev_rules \ DESTDIR=$(TMP) \ + UDEVDIR=$(shell pkg-config --variable=udevdir udev) \ LOADER_PATH=/usr/sbin/kinect_upload_fw \ FIRMWARE_PATH=/lib/firmware/kinect/UACFirmware
Bug#1058840: libplayerone: corrected patch
Please find a corrected patch attached. The initial version dropped the 'rules.d' subdirectory by accident. Sorry, Chris diff -Nru libplayerone-3.1.0+20221218103507/debian/changelog libplayerone-3.1.0+20221218103507/debian/changelog --- libplayerone-3.1.0+20221218103507/debian/changelog 2022-12-18 11:36:28.0 +0100 +++ libplayerone-3.1.0+20221218103507/debian/changelog 2023-12-17 00:08:23.0 +0100 @@ -1,3 +1,10 @@ +libplayerone (3.1.0+20221218103507-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:08:23 +0100 + libplayerone (3.1.0+20221218103507-1) unstable; urgency=medium * build version from git diff -Nru libplayerone-3.1.0+20221218103507/debian/control libplayerone-3.1.0+20221218103507/debian/control --- libplayerone-3.1.0+20221218103507/debian/control 2022-12-18 11:35:12.0 +0100 +++ libplayerone-3.1.0+20221218103507/debian/control 2023-12-17 00:08:23.0 +0100 @@ -6,6 +6,8 @@ Build-Depends: debhelper-compat (= 13) , cmake , libusb-1.0-0-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru libplayerone-3.1.0+20221218103507/debian/rules libplayerone-3.1.0+20221218103507/debian/rules --- libplayerone-3.1.0+20221218103507/debian/rules 2022-12-18 11:35:12.0 +0100 +++ libplayerone-3.1.0+20221218103507/debian/rules 2023-12-17 00:08:23.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058845: libasi: use udev.pc to place udev rules
Source: libasi Version: 1.27+20221218230335-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru libasi-1.27+20221218230335/debian/changelog libasi-1.27+20221218230335/debian/changelog --- libasi-1.27+20221218230335/debian/changelog 2022-12-19 00:05:29.0 +0100 +++ libasi-1.27+20221218230335/debian/changelog 2023-12-17 00:36:46.0 +0100 @@ -1,3 +1,10 @@ +libasi (1.27+20221218230335-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:36:46 +0100 + libasi (1.27+20221218230335-1) unstable; urgency=medium * build version from git diff -Nru libasi-1.27+20221218230335/debian/control libasi-1.27+20221218230335/debian/control --- libasi-1.27+20221218230335/debian/control 2022-12-19 00:03:44.0 +0100 +++ libasi-1.27+20221218230335/debian/control 2023-12-17 00:36:29.0 +0100 @@ -6,6 +6,8 @@ Build-Depends: debhelper-compat (= 13) , cmake , libusb-1.0-0-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru libasi-1.27+20221218230335/debian/rules libasi-1.27+20221218230335/debian/rules --- libasi-1.27+20221218230335/debian/rules 2022-12-19 00:03:44.0 +0100 +++ libasi-1.27+20221218230335/debian/rules 2023-12-17 00:36:46.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058842: libmicam: corrected patch
Please find a corrected patch attached. Sorry! Chris diff -Nru libmicam-1.0+20221224111636/debian/changelog libmicam-1.0+20221224111636/debian/changelog --- libmicam-1.0+20221224111636/debian/changelog 2022-12-24 12:17:52.0 +0100 +++ libmicam-1.0+20221224111636/debian/changelog 2023-12-17 00:15:29.0 +0100 @@ -1,3 +1,10 @@ +libmicam (1.0+20221224111636-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:15:29 +0100 + libmicam (1.0+20221224111636-1) unstable; urgency=medium * build version from git diff -Nru libmicam-1.0+20221224111636/debian/control libmicam-1.0+20221224111636/debian/control --- libmicam-1.0+20221224111636/debian/control 2022-12-24 12:16:40.0 +0100 +++ libmicam-1.0+20221224111636/debian/control 2023-12-17 00:14:54.0 +0100 @@ -6,6 +6,8 @@ Build-Depends: debhelper-compat (= 13) , cmake , libusb-1.0-0-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru libmicam-1.0+20221224111636/debian/rules libmicam-1.0+20221224111636/debian/rules --- libmicam-1.0+20221224111636/debian/rules 2022-12-24 12:16:40.0 +0100 +++ libmicam-1.0+20221224111636/debian/rules 2023-12-17 00:15:29.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)/rules.d
Bug#1058844: libinovasdk: use udev.pc to place udev rules
Source: libinovasdk
Version: 1.3.6-3
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru libinovasdk-1.3.6/debian/changelog libinovasdk-1.3.6/debian/changelog
--- libinovasdk-1.3.6/debian/changelog 2022-05-14 23:30:36.0 +0200
+++ libinovasdk-1.3.6/debian/changelog 2023-12-17 00:19:11.0 +0100
@@ -1,3 +1,10 @@
+libinovasdk (1.3.6-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 00:19:11 +0100
+
libinovasdk (1.3.6-3) unstable; urgency=medium
* manual build on: i386 amd64 arm64
diff -Nru libinovasdk-1.3.6/debian/control libinovasdk-1.3.6/debian/control
--- libinovasdk-1.3.6/debian/control 2022-05-14 23:30:36.0 +0200
+++ libinovasdk-1.3.6/debian/control 2023-12-17 00:18:39.0 +0100
@@ -6,6 +6,8 @@
Build-Depends: debhelper-compat (= 13)
, cmake
, libusb-1.0-0-dev
+ , pkgconf
+ , systemd-dev
, zlib1g-dev
Standards-Version: 4.6.0
Homepage: https://github.com/indilib/indi-3rdparty
diff -Nru libinovasdk-1.3.6/debian/libinovasdk1.install libinovasdk-1.3.6/debian/libinovasdk1.install
--- libinovasdk-1.3.6/debian/libinovasdk1.install 2022-05-14 23:30:36.0 +0200
+++ libinovasdk-1.3.6/debian/libinovasdk1.install 2023-12-17 00:19:11.0 +0100
@@ -1,2 +1,2 @@
usr/lib/*/libinovasdk.so.*
-lib/udev/rules.d/99-inovaplx.rules
+${env:deb_udevdir}/rules.d/99-inovaplx.rules
diff -Nru libinovasdk-1.3.6/debian/rules libinovasdk-1.3.6/debian/rules
--- libinovasdk-1.3.6/debian/rules 2022-05-14 23:30:36.0 +0200
+++ libinovasdk-1.3.6/debian/rules 2023-12-17 00:19:11.0 +0100
@@ -1,8 +1,13 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev)
%:
dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DUDEVRULES_INSTALL_DIR=$(deb_udevdir)/rules.d
+
override_dh_auto_install:
find
dh_auto_install
Bug#1058843: libfprint: use udev.pc to place udev rules
Source: libfprint
Version: 1:1.94.6-2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru libfprint-1.94.6/debian/changelog libfprint-1.94.6/debian/changelog
--- libfprint-1.94.6/debian/changelog 2023-08-24 09:19:31.0 +0200
+++ libfprint-1.94.6/debian/changelog 2023-12-17 00:21:28.0 +0100
@@ -1,3 +1,10 @@
+libfprint (1:1.94.6-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 00:21:28 +0100
+
libfprint (1:1.94.6-2) unstable; urgency=medium
* debian/control: Update standards-version to 4.6.2, no change needed
diff -Nru libfprint-1.94.6/debian/control libfprint-1.94.6/debian/control
--- libfprint-1.94.6/debian/control 2023-08-24 09:19:31.0 +0200
+++ libfprint-1.94.6/debian/control 2023-12-17 00:20:33.0 +0100
@@ -15,9 +15,11 @@
libnss3-dev,
libpixman-1-dev,
meson,
+ pkgconf,
python3 ,
python3-cairo ,
python3-gi ,
+ systemd-dev,
umockdev
Build-Depends-Indep: libglib2.0-doc , libgusb-doc
Standards-Version: 4.6.2
diff -Nru libfprint-1.94.6/debian/libfprint-2-2.install libfprint-1.94.6/debian/libfprint-2-2.install
--- libfprint-1.94.6/debian/libfprint-2-2.install 2023-08-24 09:19:31.0 +0200
+++ libfprint-1.94.6/debian/libfprint-2-2.install 2023-12-17 00:20:52.0 +0100
@@ -1,3 +1,3 @@
-lib/udev/hwdb.d/
-lib/udev/rules.d/
+${env:deb_udevdir}/hwdb.d/
+${env:deb_udevdir}/rules.d/
usr/lib/${DEB_HOST_MULTIARCH}/libfprint-[0-9].so.*
diff -Nru libfprint-1.94.6/debian/rules libfprint-1.94.6/debian/rules
--- libfprint-1.94.6/debian/rules 2023-08-24 09:19:31.0 +0200
+++ libfprint-1.94.6/debian/rules 2023-12-17 00:20:08.0 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
@@ -7,8 +9,8 @@
# Configuration arguments
CONFIG_ARGS = \
-Dudev_hwdb=enabled \
- -Dudev_hwdb_dir=/lib/udev/hwdb.d \
- -Dudev_rules_dir=/lib/udev/rules.d \
+ -Dudev_hwdb_dir=/$(deb_udevdir)/hwdb.d \
+ -Dudev_rules_dir=/$(deb_udevdir)/rules.d \
-Ddrivers=all \
-Dgtk-examples=false
Bug#1058840: libplayerone: use udev.pc to place udev rules
Source: libplayerone Version: 3.1.0+20221218103507-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru libplayerone-3.1.0+20221218103507/debian/changelog libplayerone-3.1.0+20221218103507/debian/changelog --- libplayerone-3.1.0+20221218103507/debian/changelog 2022-12-18 11:36:28.0 +0100 +++ libplayerone-3.1.0+20221218103507/debian/changelog 2023-12-17 00:08:23.0 +0100 @@ -1,3 +1,10 @@ +libplayerone (3.1.0+20221218103507-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:08:23 +0100 + libplayerone (3.1.0+20221218103507-1) unstable; urgency=medium * build version from git diff -Nru libplayerone-3.1.0+20221218103507/debian/control libplayerone-3.1.0+20221218103507/debian/control --- libplayerone-3.1.0+20221218103507/debian/control 2022-12-18 11:35:12.0 +0100 +++ libplayerone-3.1.0+20221218103507/debian/control 2023-12-17 00:08:23.0 +0100 @@ -6,6 +6,8 @@ Build-Depends: debhelper-compat (= 13) , cmake , libusb-1.0-0-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru libplayerone-3.1.0+20221218103507/debian/rules libplayerone-3.1.0+20221218103507/debian/rules --- libplayerone-3.1.0+20221218103507/debian/rules 2022-12-18 11:35:12.0 +0100 +++ libplayerone-3.1.0+20221218103507/debian/rules 2023-12-17 00:08:08.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)
Bug#1058842: libmicam: use udev.pc to place udev rules
Source: libmicam Version: 1.0+20221224111636-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru libmicam-1.0+20221224111636/debian/changelog libmicam-1.0+20221224111636/debian/changelog --- libmicam-1.0+20221224111636/debian/changelog 2022-12-24 12:17:52.0 +0100 +++ libmicam-1.0+20221224111636/debian/changelog 2023-12-17 00:15:29.0 +0100 @@ -1,3 +1,10 @@ +libmicam (1.0+20221224111636-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:15:29 +0100 + libmicam (1.0+20221224111636-1) unstable; urgency=medium * build version from git diff -Nru libmicam-1.0+20221224111636/debian/control libmicam-1.0+20221224111636/debian/control --- libmicam-1.0+20221224111636/debian/control 2022-12-24 12:16:40.0 +0100 +++ libmicam-1.0+20221224111636/debian/control 2023-12-17 00:14:54.0 +0100 @@ -6,6 +6,8 @@ Build-Depends: debhelper-compat (= 13) , cmake , libusb-1.0-0-dev + , pkgconf + , systemd-dev Standards-Version: 4.6.0 Homepage: https://github.com/indilib/indi-3rdparty Rules-Requires-Root: no diff -Nru libmicam-1.0+20221224111636/debian/rules libmicam-1.0+20221224111636/debian/rules --- libmicam-1.0+20221224111636/debian/rules 2022-12-24 12:16:40.0 +0100 +++ libmicam-1.0+20221224111636/debian/rules 2023-12-17 00:15:24.0 +0100 @@ -2,3 +2,7 @@ %: dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUDEVRULES_INSTALL_DIR=$(shell pkg-config --variable=udevdir udev)
Bug#1058841: libopenobex: use udev.pc to place udev rules
Source: libopenobex
Version: 1.7.2-2.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru libopenobex-1.7.2/debian/changelog libopenobex-1.7.2/debian/changelog
--- libopenobex-1.7.2/debian/changelog 2021-12-20 12:00:45.0 +0100
+++ libopenobex-1.7.2/debian/changelog 2023-12-17 00:13:21.0 +0100
@@ -1,3 +1,10 @@
+libopenobex (1.7.2-2.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 00:13:21 +0100
+
libopenobex (1.7.2-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru libopenobex-1.7.2/debian/control libopenobex-1.7.2/debian/control
--- libopenobex-1.7.2/debian/control 2021-12-20 11:55:02.0 +0100
+++ libopenobex-1.7.2/debian/control 2023-12-17 00:12:14.0 +0100
@@ -5,7 +5,8 @@
Build-Depends: debhelper-compat (= 13), cmake (>= 2.6.3),
libbluetooth-dev [linux-any], libusb-1.0-0-dev,
pkg-config, doxygen, docbook-xml, docbook-xsl,
- xsltproc, libxml2-utils, graphviz
+ xsltproc, libxml2-utils, graphviz ,
+ systemd-dev
Standards-Version: 4.6.0.1
Homepage: http://sourceforge.net/projects/openobex/
Vcs-Git: https://salsa.debian.org/debian/libopenobex.git
diff -Nru libopenobex-1.7.2/debian/libopenobex2.install libopenobex-1.7.2/debian/libopenobex2.install
--- libopenobex-1.7.2/debian/libopenobex2.install 2021-12-20 11:55:02.0 +0100
+++ libopenobex-1.7.2/debian/libopenobex2.install 2023-12-17 00:13:18.0 +0100
@@ -1,3 +1,3 @@
usr/lib/*/libopenobex.so.*
usr/sbin/obex-check-device
-lib/udev/rules.d/60-openobex.rules
+${env:deb_udevdir}/rules.d/60-openobex.rules
diff -Nru libopenobex-1.7.2/debian/rules libopenobex-1.7.2/debian/rules
--- libopenobex-1.7.2/debian/rules 2021-12-20 11:57:51.0 +0100
+++ libopenobex-1.7.2/debian/rules 2023-12-17 00:12:59.0 +0100
@@ -6,6 +6,8 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
BUILDDIR = obj-$(DEB_HOST_MULTIARCH)
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@
Bug#1058838: madfuload: use udev.pc to place udev rules
Source: madfuload
Version: 1.2-4.2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru madfuload-1.2/debian/changelog madfuload-1.2/debian/changelog
--- madfuload-1.2/debian/changelog 2017-07-12 13:28:24.0 +0200
+++ madfuload-1.2/debian/changelog 2023-12-17 00:04:46.0 +0100
@@ -1,3 +1,12 @@
+madfuload (1.2-4.3) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+ * Assume upgrades from 2009 are completed, drop preinst cleaning up
+old udev rules in /etc.
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 00:04:46 +0100
+
madfuload (1.2-4.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru madfuload-1.2/debian/control madfuload-1.2/debian/control
--- madfuload-1.2/debian/control 2017-07-12 13:28:24.0 +0200
+++ madfuload-1.2/debian/control 2023-12-17 00:04:46.0 +0100
@@ -3,6 +3,8 @@
Priority: extra
Maintainer: Free Ekanayaka
Build-Depends: debhelper (>= 10),
+ pkgconf,
+ systemd-dev,
udev (>= 136),
Standards-Version: 3.8.4
Homepage: http://usb-midi-fw.sourceforge.net/
diff -Nru madfuload-1.2/debian/preinst madfuload-1.2/debian/preinst
--- madfuload-1.2/debian/preinst 2015-11-28 23:59:17.0 +0100
+++ madfuload-1.2/debian/preinst 1970-01-01 01:00:00.0 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = install ] || [ "$1" = upgrade ]; then
- if [ -e "/etc/udev/rules.d/42-madfuload.rules" ]; then
- if [ "`md5sum \"/etc/udev/rules.d/42-madfuload.rules\" | sed -e \"s/ .*//\"`" = \
- "`dpkg-query -W -f='${Conffiles}' madfuload | sed -n -e \"' /etc/udev/rules.d/42-madfuload.rules's/.* //p\"`" ]
- then
- rm -f "/etc/udev/rules.d/42-madfuload.rules"
- fi
- fi
-fi
-
-#DEBHELPER#
diff -Nru madfuload-1.2/debian/rules madfuload-1.2/debian/rules
--- madfuload-1.2/debian/rules 2017-07-12 13:28:24.0 +0200
+++ madfuload-1.2/debian/rules 2023-12-17 00:04:46.0 +0100
@@ -3,4 +3,4 @@
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --with-udev=/lib/udev
+ dh_auto_configure -- --with-udev=$(shell pkg-config --variable=udevdir udev)
Bug#1058839: opencpn: use udev.pc to place udev rules
Source: opencpn
Version: 5.8.4+dfsg-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru opencpn-5.8.4+dfsg/debian/changelog opencpn-5.8.4+dfsg/debian/changelog
--- opencpn-5.8.4+dfsg/debian/changelog 2023-06-15 20:26:20.0 +0200
+++ opencpn-5.8.4+dfsg/debian/changelog 2023-12-17 00:00:25.0 +0100
@@ -1,3 +1,10 @@
+opencpn (5.8.4+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sun, 17 Dec 2023 00:00:25 +0100
+
opencpn (5.8.4+dfsg-1) unstable; urgency=medium
* New upstream release.
diff -Nru opencpn-5.8.4+dfsg/debian/control opencpn-5.8.4+dfsg/debian/control
--- opencpn-5.8.4+dfsg/debian/control 2023-05-17 10:09:06.0 +0200
+++ opencpn-5.8.4+dfsg/debian/control 2023-12-16 23:59:33.0 +0100
@@ -30,8 +30,10 @@
libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev,
libwxgtk-webview3.2-dev | libwxgtk-webview3.0-gtk3-dev,
lsb-release,
+ pkgconf,
portaudio19-dev,
- rapidjson-dev
+ rapidjson-dev,
+ systemd-dev
Standards-Version: 4.6.2
Vcs-Browser: https://gitlab.com/leamas/opencpn
Vcs-Git: https://gitlab.com/leamas/opencpn.git -b debian/sid
diff -Nru opencpn-5.8.4+dfsg/debian/opencpn.install opencpn-5.8.4+dfsg/debian/opencpn.install
--- opencpn-5.8.4+dfsg/debian/opencpn.install 2023-05-07 09:06:59.0 +0200
+++ opencpn-5.8.4+dfsg/debian/opencpn.install 2023-12-17 00:00:22.0 +0100
@@ -1,4 +1,4 @@
-lib/udev/rules.d/98-sglock-ocpn.rules
+lib/udev/rules.d/98-sglock-ocpn.rules ${env:deb_udevdir}/rules.d/
usr/bin/opencpn
usr/bin/opencpn-cmd
usr/lib/opencpn/*.so
diff -Nru opencpn-5.8.4+dfsg/debian/rules opencpn-5.8.4+dfsg/debian/rules
--- opencpn-5.8.4+dfsg/debian/rules 2023-05-07 09:06:59.0 +0200
+++ opencpn-5.8.4+dfsg/debian/rules 2023-12-16 23:59:43.0 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
include /usr/share/dpkg/architecture.mk
Bug#1058837: midisport-firmware: use udev.pc to place udev rules
Source: midisport-firmware Version: 1.2-5 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru midisport-firmware-1.2/debian/changelog midisport-firmware-1.2/debian/changelog --- midisport-firmware-1.2/debian/changelog 2023-09-28 22:48:50.0 +0200 +++ midisport-firmware-1.2/debian/changelog 2023-12-17 00:01:52.0 +0100 @@ -1,3 +1,10 @@ +midisport-firmware (1.2-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sun, 17 Dec 2023 00:01:52 +0100 + midisport-firmware (1.2-5) unstable; urgency=medium * Team upload diff -Nru midisport-firmware-1.2/debian/control midisport-firmware-1.2/debian/control --- midisport-firmware-1.2/debian/control 2023-09-28 22:48:50.0 +0200 +++ midisport-firmware-1.2/debian/control 2023-12-17 00:01:02.0 +0100 @@ -10,7 +10,9 @@ udev, autoconf, automake, - fxload + fxload, + pkgconf, + systemd-dev Standards-Version: 3.9.1 DM-Upload-Allowed: yes Homepage: http://usb-midi-fw.sourceforge.net/ diff -Nru midisport-firmware-1.2/debian/control.in midisport-firmware-1.2/debian/control.in --- midisport-firmware-1.2/debian/control.in 2023-09-28 22:48:50.0 +0200 +++ midisport-firmware-1.2/debian/control.in 2023-12-17 00:01:32.0 +0100 @@ -7,7 +7,9 @@ udev, autoconf, automake, - fxload + fxload, + pkgconf, + systemd-dev Standards-Version: 3.9.1 DM-Upload-Allowed: yes Homepage: http://usb-midi-fw.sourceforge.net/ diff -Nru midisport-firmware-1.2/debian/rules midisport-firmware-1.2/debian/rules --- midisport-firmware-1.2/debian/rules 2023-09-28 22:48:19.0 +0200 +++ midisport-firmware-1.2/debian/rules 2023-12-17 00:01:48.0 +0100 @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_EXTRA_FLAGS := --with-udev=/lib/udev/ +DEB_CONFIGURE_EXTRA_FLAGS := --with-udev=$(shell pkg-config --variable=udevdir udev)/ post-patches:: autoreconf -fi
Bug#1058835: openrazer: use udev.pc to place udev rules
Source: openrazer
Version: 3.7.0+dfsg-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru openrazer-3.7.0+dfsg/debian/changelog openrazer-3.7.0+dfsg/debian/changelog
--- openrazer-3.7.0+dfsg/debian/changelog 2023-11-24 15:47:09.0 +0100
+++ openrazer-3.7.0+dfsg/debian/changelog 2023-12-16 23:55:45.0 +0100
@@ -1,3 +1,10 @@
+openrazer (3.7.0+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:55:45 +0100
+
openrazer (3.7.0+dfsg-1) unstable; urgency=medium
* New upstream version 3.7.0+dfsg
diff -Nru openrazer-3.7.0+dfsg/debian/control openrazer-3.7.0+dfsg/debian/control
--- openrazer-3.7.0+dfsg/debian/control 2023-11-24 15:47:09.0 +0100
+++ openrazer-3.7.0+dfsg/debian/control 2023-12-16 23:55:45.0 +0100
@@ -5,8 +5,10 @@
Build-Depends: debhelper-compat (= 13),
dh-python,
dh-sequence-dkms,
+ pkgconf,
python3,
- python3-setuptools
+ python3-setuptools,
+ systemd-dev,
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/debian/openrazer
Vcs-Git: https://salsa.debian.org/debian/openrazer.git
diff -Nru openrazer-3.7.0+dfsg/debian/openrazer-driver-dkms.install openrazer-3.7.0+dfsg/debian/openrazer-driver-dkms.install
--- openrazer-3.7.0+dfsg/debian/openrazer-driver-dkms.install 2023-11-24 15:47:09.0 +0100
+++ openrazer-3.7.0+dfsg/debian/openrazer-driver-dkms.install 2023-12-16 23:55:17.0 +0100
@@ -1,3 +1,3 @@
-lib/udev/
+${env:deb_udevdir}/
usr/src/
usr/share/metainfo/io.github.openrazer.openrazer.metainfo.xml
diff -Nru openrazer-3.7.0+dfsg/debian/patches/series openrazer-3.7.0+dfsg/debian/patches/series
--- openrazer-3.7.0+dfsg/debian/patches/series 2023-11-24 15:47:09.0 +0100
+++ openrazer-3.7.0+dfsg/debian/patches/series 2023-12-16 23:52:17.0 +0100
@@ -1 +1,2 @@
skip-without-CONFIG_USB.patch
+udevdir.patch
diff -Nru openrazer-3.7.0+dfsg/debian/patches/udevdir.patch openrazer-3.7.0+dfsg/debian/patches/udevdir.patch
--- openrazer-3.7.0+dfsg/debian/patches/udevdir.patch 1970-01-01 01:00:00.0 +0100
+++ openrazer-3.7.0+dfsg/debian/patches/udevdir.patch 2023-12-16 23:55:29.0 +0100
@@ -0,0 +1,31 @@
+Align udev variable in Makefile with udev.pc, and how this is typically done
+using pkg-config.
+
+Probably suitable for upstream.
+
+Index: openrazer-3.7.0+dfsg/Makefile
+===
+--- openrazer-3.7.0+dfsg.orig/Makefile
openrazer-3.7.0+dfsg/Makefile
+@@ -12,8 +12,8 @@
+
+ # PREFIX is used to prefix where the files will be installed under DESTDIR
+ PREFIX?=/usr
+-# UDEV_PREFIX is specifically a prefix for udev files
+-UDEV_PREFIX?=$(PREFIX)
++# UDEVDIR is specifically a prefix for udev files
++UDEVDIR?=$(shell pkg-config --variable=udevdir udev)
+ # DESTDIR is used to install into a different root directory
+ DESTDIR?=/
+ # Specify the kernel directory to use
+@@ -108,8 +108,8 @@ remove_dkms:
+ udev_install:
+ @echo -e "\n::\033[34m Installing OpenRazer udev rules\033[0m"
+ @echo "="
+- install -m 644 -v -D install_files/udev/99-razer.rules $(DESTDIR)$(UDEV_PREFIX)/lib/udev/rules.d/99-razer.rules
+- install -m 755 -v -D install_files/udev/razer_mount $(DESTDIR)$(UDEV_PREFIX)/lib/udev/razer_mount
++ install -m 644 -v -D install_files/udev/99-razer.rules $(DESTDIR)$(UDEVDIR)/rules.d/99-razer.rules
++ install -m 755 -v -D install_files/udev/razer_mount $(DESTDIR)$(UDEVDIR)/razer_mount
+
+ appstream_install:
+ @echo -e "\n::\033[34m Installing OpenRazer AppStream metadata\033[0m"
diff -Nru openrazer-3.7.0+dfsg/debian/rules openrazer-3.7.0+dfsg/debian/rules
--- openrazer-3.7.0+dfsg/debian/rules 2023-11-24 15:47:09.0 +0100
+++ openrazer-3.7.0+dfsg/debian/rules 2023-12-16 23:55:03.0 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
%:
dh $@ --with python3
@@ -14,7 +15,7 @@
over
Bug#1058834: ponyprog: use udev.pc to place udev rules
Source: ponyprog
Version: 3.1.3+ds-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru ponyprog-3.1.3+ds/debian/changelog ponyprog-3.1.3+ds/debian/changelog
--- ponyprog-3.1.3+ds/debian/changelog 2022-03-10 16:33:58.0 +0100
+++ ponyprog-3.1.3+ds/debian/changelog 2023-12-16 23:49:15.0 +0100
@@ -1,3 +1,10 @@
+ponyprog (3.1.3+ds-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:49:15 +0100
+
ponyprog (3.1.3+ds-1) unstable; urgency=medium
* [6909f06] d/gbp.conf: Update content to filter out
diff -Nru ponyprog-3.1.3+ds/debian/control ponyprog-3.1.3+ds/debian/control
--- ponyprog-3.1.3+ds/debian/control 2022-03-10 16:33:58.0 +0100
+++ ponyprog-3.1.3+ds/debian/control 2023-12-16 23:47:55.0 +0100
@@ -11,8 +11,10 @@
libftdi1-dev,
libftdipp1-dev,
libusb-dev,
+ pkgconf,
qtbase5-dev,
qtmultimedia5-dev,
+ systemd-dev,
Rules-Requires-Root: binary-targets
Standards-Version: 4.6.0
Homepage: https://github.com/lancos/ponyprog
diff -Nru ponyprog-3.1.3+ds/debian/ponyprog.install ponyprog-3.1.3+ds/debian/ponyprog.install
--- ponyprog-3.1.3+ds/debian/ponyprog.install 2022-03-10 16:17:22.0 +0100
+++ ponyprog-3.1.3+ds/debian/ponyprog.install 2023-12-16 23:49:08.0 +0100
@@ -1,3 +1,3 @@
icons/ponyprog.svg usr/share/icons/hicolor/scalable/apps
-lib/udev/rules.d/90-ponyprog.rules
+${env:deb_udevdir}/rules.d/90-ponyprog.rules
usr
diff -Nru ponyprog-3.1.3+ds/debian/rules ponyprog-3.1.3+ds/debian/rules
--- ponyprog-3.1.3+ds/debian/rules 2022-03-10 16:33:58.0 +0100
+++ ponyprog-3.1.3+ds/debian/rules 2023-12-16 23:49:01.0 +0100
@@ -15,6 +15,8 @@
CFLAGS+=$(CPPFLAGS)
CXXFLAGS+=$(CPPFLAGS)
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
ICON_SIZES=128x128 64x64 48x48 32x32 24x24 16x16
# detect the encoding of the file ponyprog.html
@@ -27,6 +29,7 @@
DEB_PONYPROG_CMAKE_OPTS := \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
+ -DUDEV_INSTALL_DIR="/$(deb_udevdir)/rules.d" \
-DUSE_DEBUGGER=ON \
-DUSE_QT5=ON \
$(NULL)
Bug#1058833: qlcplus: use udev.pc to place udev rules
Source: qlcplus
Version: 4.12.7-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru qlcplus-4.12.7/debian/changelog qlcplus-4.12.7/debian/changelog
--- qlcplus-4.12.7/debian/changelog 2023-05-25 19:43:39.0 +0200
+++ qlcplus-4.12.7/debian/changelog 2023-12-16 23:31:26.0 +0100
@@ -1,3 +1,10 @@
+qlcplus (4.12.7-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:31:26 +0100
+
qlcplus (4.12.7-1) unstable; urgency=medium
* New upstream version 4.12.7
diff -Nru qlcplus-4.12.7/debian/control qlcplus-4.12.7/debian/control
--- qlcplus-4.12.7/debian/control 2023-05-25 19:43:39.0 +0200
+++ qlcplus-4.12.7/debian/control 2023-12-16 23:31:26.0 +0100
@@ -20,6 +20,7 @@
qtscript5-dev,
qttools5-dev-tools,
shared-mime-info (>= 0.71),
+ systemd-dev,
xauth ,
xvfb
Standards-Version: 4.6.2
diff -Nru qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch
--- qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch 2023-05-25 19:43:39.0 +0200
+++ qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch 2023-12-16 23:31:26.0 +0100
@@ -7,16 +7,15 @@
variables.pri | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/variables.pri b/variables.pri
-index 0fc7258..7cbf343 100644
a/variables.pri
-+++ b/variables.pri
-@@ -251,7 +251,7 @@ android:USERCOLORFILTERSDIR= $$USERDATADIR/colorfilters
+Index: qlcplus-4.12.7/variables.pri
+===
+--- qlcplus-4.12.7.orig/variables.pri
qlcplus-4.12.7/variables.pri
+@@ -251,7 +251,6 @@ android:USERCOLORFILTERSDIR= $$USERD
ios:USERCOLORFILTERSDIR= $$USERDATADIR/ColorFilters
# udev rules
-unix:!macx:UDEVRULESDIR = /etc/udev/rules.d
-+unix:!macx:UDEVRULESDIR = /lib/udev/rules.d
# AppStream metadata
unix:!macx:METAINFODIR = $$INSTALLROOT/share/metainfo
diff -Nru qlcplus-4.12.7/debian/qlcplus.install qlcplus-4.12.7/debian/qlcplus.install
--- qlcplus-4.12.7/debian/qlcplus.install 2023-05-25 19:43:39.0 +0200
+++ qlcplus-4.12.7/debian/qlcplus.install 2023-12-16 23:31:18.0 +0100
@@ -1,4 +1,4 @@
-lib/udev/rules.d/
+${env:deb_udevdir}/rules.d/
usr/bin/qlcplus*
usr/lib/*/libqlcplus*.so.*
usr/lib/*/qt5/plugins/qlcplus/
diff -Nru qlcplus-4.12.7/debian/rules qlcplus-4.12.7/debian/rules
--- qlcplus-4.12.7/debian/rules 2023-05-25 19:43:39.0 +0200
+++ qlcplus-4.12.7/debian/rules 2023-12-16 23:31:02.0 +0100
@@ -9,6 +9,8 @@
TESTS_HOME = $(CURDIR)/debian/tests.home
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@
@@ -18,7 +20,7 @@
override_dh_auto_configure:
./translate.sh
- dh_auto_configure -- FORCECONFIG=release
+ dh_auto_configure -- FORCECONFIG=release UDEVRULESDIR=/$(deb_udevdir)/rules.d
override_dh_auto_install:
dh_auto_install
Bug#1058832: projecteur: use udev.pc to place udev rules
Source: projecteur Version: 0.10-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib, your package will benefit automatically after a binNMU or any other upload. The upstream build system already supports pkg-config, and the patch just ensures udev.pc is available. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru projecteur-0.10/debian/changelog projecteur-0.10/debian/changelog --- projecteur-0.10/debian/changelog 2023-10-21 08:25:44.0 +0200 +++ projecteur-0.10/debian/changelog 2023-12-16 23:43:31.0 +0100 @@ -1,3 +1,10 @@ +projecteur (0.10-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 16 Dec 2023 23:43:31 +0100 + projecteur (0.10-1) unstable; urgency=medium * New upstream release. diff -Nru projecteur-0.10/debian/control projecteur-0.10/debian/control --- projecteur-0.10/debian/control 2023-10-21 08:25:44.0 +0200 +++ projecteur-0.10/debian/control 2023-12-16 23:43:24.0 +0100 @@ -16,6 +16,7 @@ qml-module-qtgraphicaleffects, qml-module-qtquick-window2, qml-module-qtquick2, + systemd-dev, Homepage: https://github.com/jahnf/Projecteur/ Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/projecteur.git
Bug#1058831: squeak-plugins-scratch: let dh_installudev pick location of udev rules
Source: squeak-plugins-scratch
Version: 1.4.0.2~svn.r83-3.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using dh_installudev to install
the udev rule. When dh_installudev gets changed in unstable, your
package will benefit via a binNMU or the next normal upload.
This is safe to do now.
Later during the trixie cycle I expect this bug class to raise in
priority.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/95-wedo.rules squeak-plugins-scratch-1.4.0.2~svn.r83/debian/95-wedo.rules
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/95-wedo.rules 2022-12-01 21:18:32.0 +0100
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/95-wedo.rules 1970-01-01 01:00:00.0 +0100
@@ -1,2 +0,0 @@
-ATTRS{idVendor}=="0694", ATTRS{idProduct}=="0003", SUBSYSTEMS=="usb", ACTION=="add", MODE="0666", GROUP="plugdev"
-
diff -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog 2022-12-01 21:18:32.0 +0100
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog 2023-12-16 23:21:32.0 +0100
@@ -1,3 +1,10 @@
+squeak-plugins-scratch (1.4.0.2~svn.r83-3.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Let dh_installudev install udev rules. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:21:32 +0100
+
squeak-plugins-scratch (1.4.0.2~svn.r83-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/control squeak-plugins-scratch-1.4.0.2~svn.r83/debian/control
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/control 2022-12-01 21:18:32.0 +0100
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/control 2023-12-16 23:21:32.0 +0100
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Miriam Ruiz
-Build-Depends: debhelper, dh-buildinfo,
+Build-Depends: debhelper (>= 13), dh-buildinfo,
libcairo2-dev (>= 1.8.6), libpango1.0-dev (>= 1.24.1),
libglib2.0-dev (>= 2.20.1), libv4l-dev (>= 0.5.8)
Standards-Version: 4.2.1.4
diff -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules 2022-12-01 21:18:32.0 +0100
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules 2023-12-16 23:21:32.0 +0100
@@ -68,6 +68,7 @@
dh_installexamples -a
dh_install -a
dh_installman -a
+ dh_installudev -a --priority=95 --name=wedo
dh_link -a
dh_strip -a --dbg-package=squeak-plugins-scratch-dbg
dh_compress -a
diff -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.install squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.install
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.install 2022-12-01 21:18:32.0 +0100
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.install 2023-12-16 23:21:32.0 +0100
@@ -3,4 +3,3 @@
unicode/so.UnicodePlugin usr/lib/scratch/plugins/
wedo/so.WeDoPlugin usr/lib/scratch/plugins/
debian/run-scratch usr/share/doc/squeak-plugins-scratch/scripts/
-debian/95-wedo.rules lib/udev/rules.d/
diff -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.wedo.udev squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.wedo.udev
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.wedo.udev 1970-01-01 01:00:00.0 +0100
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/squeak-plugins-scratch.wedo.udev 2022-12-01 21:18:32.0 +0100
@@ -0,0 +1,2 @@
+ATTRS{idVendor}=="0694", ATTRS{idProduct}=="0003", SUBSYSTEMS=="usb", ACTION=="add", MODE="0666", GROUP="plugdev"
+
Bug#1058830: steam-installer: use udev.pc to place udev rules
Source: steam-installer
Version: 1:1.0.0.78~ds-3
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru steam-installer-1.0.0.78~ds/debian/changelog steam-installer-1.0.0.78~ds/debian/changelog
--- steam-installer-1.0.0.78~ds/debian/changelog 2023-07-26 13:38:12.0 +0200
+++ steam-installer-1.0.0.78~ds/debian/changelog 2023-12-16 23:18:11.0 +0100
@@ -1,3 +1,10 @@
+steam-installer (1:1.0.0.78~ds-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:18:11 +0100
+
steam-installer (1:1.0.0.78~ds-3) unstable; urgency=medium
* d/control: Tighten up steam-libs dependencies to match versions.
diff -Nru steam-installer-1.0.0.78~ds/debian/control steam-installer-1.0.0.78~ds/debian/control
--- steam-installer-1.0.0.78~ds/debian/control 2023-07-26 13:38:12.0 +0200
+++ steam-installer-1.0.0.78~ds/debian/control 2023-12-16 23:17:21.0 +0100
@@ -7,8 +7,10 @@
Simon McVittie ,
Build-Depends:
debhelper-compat (= 13),
+ pkgconf,
po-debconf,
python3:any,
+ systemd-dev,
zlib1g,
Rules-Requires-Root: no
Standards-Version: 4.6.2
diff -Nru steam-installer-1.0.0.78~ds/debian/rules steam-installer-1.0.0.78~ds/debian/rules
--- steam-installer-1.0.0.78~ds/debian/rules 2023-07-26 13:38:12.0 +0200
+++ steam-installer-1.0.0.78~ds/debian/rules 2023-12-16 23:17:41.0 +0100
@@ -2,6 +2,8 @@
include /usr/share/dpkg/default.mk
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
export DH_VERBOSE=1
%:
diff -Nru steam-installer-1.0.0.78~ds/debian/steam-devices.install steam-installer-1.0.0.78~ds/debian/steam-devices.install
--- steam-installer-1.0.0.78~ds/debian/steam-devices.install 2023-07-26 13:38:12.0 +0200
+++ steam-installer-1.0.0.78~ds/debian/steam-devices.install 2023-12-16 23:17:57.0 +0100
@@ -1,2 +1,2 @@
debian/com.steampowered.steam-devices.metainfo.xml usr/share/metainfo
-subprojects/steam-devices/*.rules lib/udev/rules.d
+subprojects/steam-devices/*.rules ${env:deb_udevdir}/rules.d
Bug#1058829: stlink: use udev.pc to place udev rules
Source: stlink
Version: 1.7.0+ds-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru stlink-1.7.0+ds/debian/changelog stlink-1.7.0+ds/debian/changelog
--- stlink-1.7.0+ds/debian/changelog 2021-08-15 15:23:25.0 +0200
+++ stlink-1.7.0+ds/debian/changelog 2023-12-16 23:11:12.0 +0100
@@ -1,3 +1,10 @@
+stlink (1.7.0+ds-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 23:11:12 +0100
+
stlink (1.7.0+ds-1) unstable; urgency=medium
* Merge tag 'v1.7.0' into debian. (Closes: #984356)
diff -Nru stlink-1.7.0+ds/debian/control stlink-1.7.0+ds/debian/control
--- stlink-1.7.0+ds/debian/control 2021-08-15 15:20:57.0 +0200
+++ stlink-1.7.0+ds/debian/control 2023-12-16 23:10:17.0 +0100
@@ -1,7 +1,7 @@
Source: stlink
Priority: optional
Maintainer: Luca Boccassi
-Build-Depends: debhelper-compat (= 13), cmake (>= 3.4.2), libusb-1.0-0-dev, libgtk-3-dev
+Build-Depends: debhelper-compat (= 13), cmake (>= 3.4.2), libusb-1.0-0-dev, libgtk-3-dev, pkgconf, systemd-dev
Standards-Version: 4.5.1
Rules-Requires-Root: no
Section: electronics
diff -Nru stlink-1.7.0+ds/debian/rules stlink-1.7.0+ds/debian/rules
--- stlink-1.7.0+ds/debian/rules 2021-08-15 15:20:57.0 +0200
+++ stlink-1.7.0+ds/debian/rules 2023-12-16 23:11:12.0 +0100
@@ -10,12 +10,14 @@
# see FEATURE AREAS in dpkg-buildflags(1)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@ --buildsystem cmake
override_dh_auto_configure:
dh_auto_configure -- \
--DSTLINK_UDEV_RULES_DIR='/lib/udev/rules.d'
+-DSTLINK_UDEV_RULES_DIR=/$(deb_udevdir)/rules.d
override_dh_auto_install:
dh_auto_install
diff -Nru stlink-1.7.0+ds/debian/stlink-tools.install stlink-1.7.0+ds/debian/stlink-tools.install
--- stlink-1.7.0+ds/debian/stlink-tools.install 2021-08-15 15:20:57.0 +0200
+++ stlink-1.7.0+ds/debian/stlink-tools.install 2023-12-16 23:10:29.0 +0100
@@ -1,3 +1,3 @@
/usr/bin/st-*
-lib/udev/rules.d/*.rules
+${env:deb_udevdir}/rules.d/*.rules
etc/modprobe.d/*.conf
Bug#1058828: thunderbolt-tools: installs tbtacl-write twice when udev.pc changes
Source: thunderbolt-tools Version: 0.9.3-6 Severity: important Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, for the currently ongoing Debian UsrMerge effort [1], we will change udev.pc soon, so "udevdir" points to /usr/lib/udev. When this happens, your package will install tbtacl-write twice, once into /usr/lib (the "canonical" path) and once into /lib (the "aliased" path): -rwxr-xr-x root/root 31568 2022-12-14 12:42 ./lib/udev/tbtacl-write -rwxr-xr-x root/root 31568 2022-12-14 12:42 ./usr/lib/udev/tbtacl-write This is a policy violation. I'm attaching a trivial patch for your convenience. Please upload as soon as possible, as the udev.pc change is already queued. This bug will become release-critical once src:systemd (contains udev) gets uploaded. Chris [1] https://wiki.debian.org/UsrMerge diff -Nru thunderbolt-tools-0.9.3/debian/changelog thunderbolt-tools-0.9.3/debian/changelog --- thunderbolt-tools-0.9.3/debian/changelog 2022-12-14 13:42:55.0 +0100 +++ thunderbolt-tools-0.9.3/debian/changelog 2023-12-16 23:00:35.0 +0100 @@ -1,3 +1,10 @@ +thunderbolt-tools (0.9.3-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Skip duplicate installation of tbtacl-write. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 16 Dec 2023 23:00:35 +0100 + thunderbolt-tools (0.9.3-6) unstable; urgency=medium * Roll in all fixes since 0.9.3, project is now in maintainence diff -Nru thunderbolt-tools-0.9.3/debian/install thunderbolt-tools-0.9.3/debian/install --- thunderbolt-tools-0.9.3/debian/install 2018-04-08 16:43:12.0 +0200 +++ thunderbolt-tools-0.9.3/debian/install 2023-12-16 23:00:00.0 +0100 @@ -1,2 +1 @@ -build_userspace/tbtacl/tbtacl-write lib/udev/ build_userspace/tbtadm/tbtadm usr/bin
Bug#1058827: ukui-settings-daemon: let dh_installudev pick location of udev rules
Source: ukui-settings-daemon Version: 3.1.1.1-3 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using dh_installudev to install the udev rule. When dh_installudev gets changed in unstable, your package will benefit via a binNMU or the next normal upload. This is safe to do now. Later during the trixie cycle I expect this bug class to raise in priority. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru ukui-settings-daemon-3.1.1.1/debian/changelog ukui-settings-daemon-3.1.1.1/debian/changelog --- ukui-settings-daemon-3.1.1.1/debian/changelog 2023-02-21 13:03:49.0 +0100 +++ ukui-settings-daemon-3.1.1.1/debian/changelog 2023-12-16 22:50:58.0 +0100 @@ -1,3 +1,10 @@ +ukui-settings-daemon (3.1.1.1-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Let dh_installudev install udev rules. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 16 Dec 2023 22:50:58 +0100 + ukui-settings-daemon (3.1.1.1-3) unstable; urgency=medium * d/patches: add fix-crash-when-access-kwin-dbus.patch. diff -Nru ukui-settings-daemon-3.1.1.1/debian/rules ukui-settings-daemon-3.1.1.1/debian/rules --- ukui-settings-daemon-3.1.1.1/debian/rules 2022-02-22 09:27:46.0 +0100 +++ ukui-settings-daemon-3.1.1.1/debian/rules 2023-12-16 22:50:52.0 +0100 @@ -2,5 +2,16 @@ export QT_SELECT=5 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +UDEVRULESFILE=debian/ukui-settings-daemon.touchpad-state-onmouse.udev + %: dh $@ + +execute_after_dh_auto_clean: + rm -f $(UDEVRULESFILE) + +execute_after_dh_auto_install: + mv debian/tmp/lib/udev/rules.d/01-touchpad-state-onmouse.rules $(UDEVRULESFILE) + +override_dh_installudev: + dh_installudev -pukui-settings-daemon --priority=01 --name=touchpad-state-onmouse diff -Nru ukui-settings-daemon-3.1.1.1/debian/ukui-settings-daemon.install ukui-settings-daemon-3.1.1.1/debian/ukui-settings-daemon.install --- ukui-settings-daemon-3.1.1.1/debian/ukui-settings-daemon.install 2022-02-22 09:27:46.0 +0100 +++ ukui-settings-daemon-3.1.1.1/debian/ukui-settings-daemon.install 2023-12-16 22:50:56.0 +0100 @@ -2,5 +2,3 @@ /usr/bin/ /usr/lib/*/ukui-settings-daemon/ /usr/share/dbus-1/ -/lib/udev/rules.d/ -
Bug#1058825: waagent: places udev rule into /lib (hard-coded path)
Source: waagent Version: 2.7.3.0-4.1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Apparently your package hard-codes the path instead of either using dh_installudev, or asking pkg-config about the correct path. Please adapt your package to use either method, or if you ignore backports, you can also just change the path to /usr/lib instead. When fixing this bug, please upload to experimental first and wait a few days. This gives the dumat tool [1] time to check your package and report any new issues. Also, if during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thanks, Chris [1] https://wiki.debian.org/UsrMerge
Bug#1058824: usb-modeswitch-data: let dh_installudev pick location of udev rules
Source: usb-modeswitch-data Version: 20191128-5 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using dh_installudev to install the udev rule. When dh_installudev gets changed in unstable, your package will benefit via a binNMU or the next normal upload. This is safe to do now. Later during the trixie cycle I expect this bug class to raise in priority. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru usb-modeswitch-data-20191128/debian/changelog usb-modeswitch-data-20191128/debian/changelog --- usb-modeswitch-data-20191128/debian/changelog 2022-04-11 20:51:02.0 +0200 +++ usb-modeswitch-data-20191128/debian/changelog 2023-12-16 22:40:16.0 +0100 @@ -1,3 +1,10 @@ +usb-modeswitch-data (20191128-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Let dh_installudev install udev rules. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 16 Dec 2023 22:40:16 +0100 + usb-modeswitch-data (20191128-5) unstable; urgency=medium * adopt package (Closes: #993779) diff -Nru usb-modeswitch-data-20191128/debian/rules usb-modeswitch-data-20191128/debian/rules --- usb-modeswitch-data-20191128/debian/rules 2022-04-11 20:51:02.0 +0200 +++ usb-modeswitch-data-20191128/debian/rules 2023-12-16 22:39:54.0 +0100 @@ -4,8 +4,14 @@ override_dh_auto_clean: # Don't run upstream's clean, as it puts the tree in a state different from tarball + rm -f debian/usb-modeswitch-data.usb_modeswitch.udev # Install in debian/tmp, to pick things with dh_install # Pack the rules for usb-modeswitch-data override_dh_auto_install: dh_auto_install --destdir=debian/tmp/ -- db-install-packed + # Let dh_installudev install the udev rule. + mv debian/tmp/lib/udev/rules.d/40-usb_modeswitch.rules debian/usb-modeswitch-data.usb_modeswitch.udev + +override_dh_installudev: + dh_installudev --priority=40 --name=usb_modeswitch diff -Nru usb-modeswitch-data-20191128/debian/usb-modeswitch-data.install usb-modeswitch-data-20191128/debian/usb-modeswitch-data.install --- usb-modeswitch-data-20191128/debian/usb-modeswitch-data.install 2022-04-11 20:51:02.0 +0200 +++ usb-modeswitch-data-20191128/debian/usb-modeswitch-data.install 2023-12-16 22:38:54.0 +0100 @@ -1,2 +1 @@ -/lib/udev/rules.d/40-usb_modeswitch.rules /usr/share/usb_modeswitch/configPack.tar.gz
Bug#1058823: usbauth: use udev.pc to place udev rules
Source: usbauth Version: 1.0.5-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 Dear Maintainer, your package installs files related to udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch using udev.pc to place the udev files (using pkg-config). This works today in unstable and also for bookworm, and is safe to do now. Once udev.pc in unstable points to /usr/lib your package will benefit automatically after a binNMU or any other upload. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Later during the trixie cycle I expect this bug class to raise in priority. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge diff -Nru usbauth-1.0.5/debian/changelog usbauth-1.0.5/debian/changelog --- usbauth-1.0.5/debian/changelog 2023-01-11 09:51:24.0 +0100 +++ usbauth-1.0.5/debian/changelog 2023-12-16 22:35:58.0 +0100 @@ -1,3 +1,10 @@ +usbauth (1.0.5-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler Sat, 16 Dec 2023 22:35:58 +0100 + usbauth (1.0.5-1) unstable; urgency=medium [ Kun-Hung Tsai (蔡昆宏) ] diff -Nru usbauth-1.0.5/debian/control usbauth-1.0.5/debian/control --- usbauth-1.0.5/debian/control 2023-01-11 09:50:44.0 +0100 +++ usbauth-1.0.5/debian/control 2023-12-16 22:34:58.0 +0100 @@ -11,7 +11,9 @@ libudev-dev, libusbauth-configparser-dev, libdbus-1-dev, - m4 + m4, + pkgconf, + systemd-dev Standards-Version: 4.6.1 Homepage: https://github.com/kochstefan/usbauth-all/tree/master/usbauth Vcs-Git: https://salsa.debian.org/debian/usbauth.git diff -Nru usbauth-1.0.5/debian/rules usbauth-1.0.5/debian/rules --- usbauth-1.0.5/debian/rules 2023-01-11 09:50:44.0 +0100 +++ usbauth-1.0.5/debian/rules 2023-12-16 22:35:51.0 +0100 @@ -6,5 +6,8 @@ %: dh $@ +override_dh_auto_install: + dh_auto_install -- udevrulesdir=$(shell pkg-config --variable=udevdir udev)/rules.d + override_dh_missing: dh_missing --fail-missing
Bug#1058821: x2gothinclient: use udev.pc to place udev rules
Source: x2gothinclient
Version: 1.5.0.1-10
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru x2gothinclient-1.5.0.1/debian/changelog x2gothinclient-1.5.0.1/debian/changelog
--- x2gothinclient-1.5.0.1/debian/changelog 2023-05-19 10:59:29.0 +0200
+++ x2gothinclient-1.5.0.1/debian/changelog 2023-12-16 22:27:22.0 +0100
@@ -1,3 +1,10 @@
+x2gothinclient (1.5.0.1-10.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 22:27:22 +0100
+
x2gothinclient (1.5.0.1-10) unstable; urgency=medium
* debian/changelog:
diff -Nru x2gothinclient-1.5.0.1/debian/control x2gothinclient-1.5.0.1/debian/control
--- x2gothinclient-1.5.0.1/debian/control 2023-05-16 22:14:12.0 +0200
+++ x2gothinclient-1.5.0.1/debian/control 2023-12-16 22:25:32.0 +0100
@@ -8,7 +8,9 @@
Build-Depends:
debhelper-compat (= 13),
qtbase5-dev,
+ pkgconf,
po-debconf,
+ systemd-dev,
Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://code.x2go.org/releases/source/x2gothinclient
diff -Nru x2gothinclient-1.5.0.1/debian/rules x2gothinclient-1.5.0.1/debian/rules
--- x2gothinclient-1.5.0.1/debian/rules 2022-10-03 11:48:15.0 +0200
+++ x2gothinclient-1.5.0.1/debian/rules 2023-12-16 22:26:32.0 +0100
@@ -4,6 +4,8 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
export QT_SELECT=qt5
DHFLAGS=--parallel
diff -Nru x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install
--- x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install 2019-12-13 12:28:30.0 +0100
+++ x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install 2023-12-16 22:27:02.0 +0100
@@ -1,3 +1,3 @@
-smartcardrules/21-x2gognupgccid.ruleslib/udev/rules.d/
+smartcardrules/21-x2gognupgccid.rules${env:deb_udevdir}/rules.d/
smartcardrules/x2gognupgccid usr/lib/x2go/tce/
diff -Nru x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install
--- x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install 2019-12-13 12:28:29.0 +0100
+++ x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install 2023-12-16 22:27:02.0 +0100
@@ -1,3 +1,3 @@
-usbmount/61-x2gousbmount.ruleslib/udev/rules.d/
+usbmount/61-x2gousbmount.rules${env:deb_udevdir}/rules.d/
usbmount/x2gousbmount usr/lib/x2go/tce/
Bug#1058820: xperia-flashtool: let dh_installudev pick location of udev rules
Source: xperia-flashtool
Version: 0.9.34+ds-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using dh_installudev to install
the udev rule. When dh_installudev gets changed in unstable, your
package will benefit via a binNMU or the next normal upload.
This is safe to do now.
Later during the trixie cycle I expect this bug class to raise in
priority.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru xperia-flashtool-0.9.34+ds/debian/50-xperia-flashtool.rules xperia-flashtool-0.9.34+ds/debian/50-xperia-flashtool.rules
--- xperia-flashtool-0.9.34+ds/debian/50-xperia-flashtool.rules 2022-03-15 17:12:07.0 +0100
+++ xperia-flashtool-0.9.34+ds/debian/50-xperia-flashtool.rules 1970-01-01 01:00:00.0 +0100
@@ -1,3 +0,0 @@
-# From http://www.flashtool.net/lininstall.php
-# Enable xperia as a user device
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="0fce", TAG+="uaccess", GROUP="plugdev", MODE="0660"
diff -Nru xperia-flashtool-0.9.34+ds/debian/changelog xperia-flashtool-0.9.34+ds/debian/changelog
--- xperia-flashtool-0.9.34+ds/debian/changelog 2022-03-15 17:12:07.0 +0100
+++ xperia-flashtool-0.9.34+ds/debian/changelog 2023-12-16 22:19:15.0 +0100
@@ -1,3 +1,10 @@
+xperia-flashtool (0.9.34+ds-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use dh_installudev to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 22:19:15 +0100
+
xperia-flashtool (0.9.34+ds-1) unstable; urgency=medium
* New upstream release 0.9.34+ds
diff -Nru xperia-flashtool-0.9.34+ds/debian/install xperia-flashtool-0.9.34+ds/debian/install
--- xperia-flashtool-0.9.34+ds/debian/install 2022-03-15 17:12:07.0 +0100
+++ xperia-flashtool-0.9.34+ds/debian/install 2023-12-16 22:19:15.0 +0100
@@ -4,4 +4,3 @@
debian/tmp/flashtool.png /usr/share/icons/locolor/32x32/apps
debian/flashtool.desktop /usr/share/applications
debian/flashtool usr/bin
-debian/50-xperia-flashtool.rules /lib/udev/rules.d
diff -Nru xperia-flashtool-0.9.34+ds/debian/rules xperia-flashtool-0.9.34+ds/debian/rules
--- xperia-flashtool-0.9.34+ds/debian/rules 2022-03-15 17:12:07.0 +0100
+++ xperia-flashtool-0.9.34+ds/debian/rules 2023-12-16 22:19:15.0 +0100
@@ -12,5 +12,8 @@
cp src/gui/ressources/icons/flash_32.png debian/tmp/flashtool.png
dh_auto_install
+override_dh_installudev:
+ dh_installudev --priority=50
+
%:
dh $@ --with javahelper --buildsystem=ant
diff -Nru xperia-flashtool-0.9.34+ds/debian/xperia-flashtool.udev xperia-flashtool-0.9.34+ds/debian/xperia-flashtool.udev
--- xperia-flashtool-0.9.34+ds/debian/xperia-flashtool.udev 1970-01-01 01:00:00.0 +0100
+++ xperia-flashtool-0.9.34+ds/debian/xperia-flashtool.udev 2022-03-15 17:12:07.0 +0100
@@ -0,0 +1,3 @@
+# From http://www.flashtool.net/lininstall.php
+# Enable xperia as a user device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="0fce", TAG+="uaccess", GROUP="plugdev", MODE="0660"
Bug#1058819: xr-hardware: use udev.pc to place udev rules
Source: xr-hardware
Version: 1.1.0-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru xr-hardware-1.1.0/debian/changelog xr-hardware-1.1.0/debian/changelog
--- xr-hardware-1.1.0/debian/changelog 2022-09-19 20:02:27.0 +0200
+++ xr-hardware-1.1.0/debian/changelog 2023-12-16 22:13:25.0 +0100
@@ -1,3 +1,10 @@
+xr-hardware (1.1.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 22:13:25 +0100
+
xr-hardware (1.1.0-1) unstable; urgency=medium
* New upstream version 1.1.0
diff -Nru xr-hardware-1.1.0/debian/control xr-hardware-1.1.0/debian/control
--- xr-hardware-1.1.0/debian/control 2022-09-19 20:02:27.0 +0200
+++ xr-hardware-1.1.0/debian/control 2023-12-16 22:13:25.0 +0100
@@ -3,9 +3,11 @@
Uploaders: Andrew Lee (李健秋)
Section: utils
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
+ pkgconf,
python3 (>= 3.7),
- python3-flake8
+ python3-flake8,
+ systemd-dev
Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/monado-team/xr-hardware
Vcs-Git: https://salsa.debian.org/monado-team/xr-hardware.git
diff -Nru xr-hardware-1.1.0/debian/rules xr-hardware-1.1.0/debian/rules
--- xr-hardware-1.1.0/debian/rules 2022-09-19 20:02:27.0 +0200
+++ xr-hardware-1.1.0/debian/rules 2023-12-16 22:13:25.0 +0100
@@ -8,6 +8,8 @@
# output every command that modifies files on the build system.
# export DH_VERBOSE = 1
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@
diff -Nru xr-hardware-1.1.0/debian/xr-hardware.install xr-hardware-1.1.0/debian/xr-hardware.install
--- xr-hardware-1.1.0/debian/xr-hardware.install 2022-09-19 20:02:27.0 +0200
+++ xr-hardware-1.1.0/debian/xr-hardware.install 2023-12-16 22:13:25.0 +0100
@@ -1 +1 @@
-70-xrhardware.rules lib/udev/rules.d/
+70-xrhardware.rules ${env:deb_udevdir}/rules.d/
Bug#1058816: yubikey-personalization: use udev.pc to place udev rules
Source: yubikey-personalization
Version: 1.20.0-3
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru yubikey-personalization-1.20.0/debian/changelog yubikey-personalization-1.20.0/debian/changelog
--- yubikey-personalization-1.20.0/debian/changelog 2020-11-25 03:31:18.0 +0100
+++ yubikey-personalization-1.20.0/debian/changelog 2023-12-16 21:51:48.0 +0100
@@ -1,3 +1,10 @@
+yubikey-personalization (1.20.0-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 21:51:48 +0100
+
yubikey-personalization (1.20.0-3) unstable; urgency=low
* Move libyubikey-udev to Section: admin (Closes: #956721)
diff -Nru yubikey-personalization-1.20.0/debian/control yubikey-personalization-1.20.0/debian/control
--- yubikey-personalization-1.20.0/debian/control 2020-11-25 03:31:18.0 +0100
+++ yubikey-personalization-1.20.0/debian/control 2023-12-16 21:51:48.0 +0100
@@ -14,7 +14,8 @@
libusb-1.0-0-dev [!hurd-i386],
libusb-dev [hurd-i386],
libyubikey-dev(>= 1.5),
- libjson-c-dev
+ libjson-c-dev,
+ systemd-dev
Rules-Requires-Root: no
Standards-Version: 4.5.1
Homepage: https://developers.yubico.com/yubikey-personalization/
diff -Nru yubikey-personalization-1.20.0/debian/libyubikey-udev.install yubikey-personalization-1.20.0/debian/libyubikey-udev.install
--- yubikey-personalization-1.20.0/debian/libyubikey-udev.install 2020-11-25 03:31:18.0 +0100
+++ yubikey-personalization-1.20.0/debian/libyubikey-udev.install 2023-12-16 21:51:48.0 +0100
@@ -1,2 +1,2 @@
-lib/udev/rules.d/*-yubikey.rules
+${env:deb_udevdir}/rules.d/*-yubikey.rules
debian/com.yubico.yubikey.udev.metainfo.xml /usr/share/metainfo/
diff -Nru yubikey-personalization-1.20.0/debian/rules yubikey-personalization-1.20.0/debian/rules
--- yubikey-personalization-1.20.0/debian/rules 2020-11-25 03:31:18.0 +0100
+++ yubikey-personalization-1.20.0/debian/rules 2023-12-16 21:51:48.0 +0100
@@ -1,10 +1,11 @@
#! /usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
%:
dh $@ --builddirectory=build
override_dh_auto_configure:
- dh_auto_configure -- --with-udevrulesdir=/lib/udev/rules.d \
+ dh_auto_configure -- --with-udevrulesdir=/$(deb_udevdir)/rules.d \
--disable-silent-rules --disable-rpath
Bug#1058804: google-android-installers: use udev.pc to place udev rules
Source: google-android-installers
Version: 1695033340
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru google-android-installers-1695033340/debian/changelog google-android-installers-1695033340+nmu1/debian/changelog
--- google-android-installers-1695033340/debian/changelog 2023-09-21 09:06:31.0 +0200
+++ google-android-installers-1695033340+nmu1/debian/changelog 2023-12-16 20:10:27.0 +0100
@@ -1,3 +1,10 @@
+google-android-installers (1695033340+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler Sat, 16 Dec 2023 20:10:27 +0100
+
google-android-installers (1695033340) unstable; urgency=medium
* New upstream update
diff -Nru google-android-installers-1695033340/debian/control google-android-installers-1695033340+nmu1/debian/control
--- google-android-installers-1695033340/debian/control 2023-09-21 09:06:31.0 +0200
+++ google-android-installers-1695033340+nmu1/debian/control 2023-12-16 20:10:27.0 +0100
@@ -5,7 +5,7 @@
Priority: optional
Maintainer: Fab Stz
Uploaders: Roger Shimizu , Mouaad Aallam
-Build-Depends: bash-completion, debhelper-compat (=13), po-debconf
+Build-Depends: bash-completion, debhelper-compat (=13), pkgconf, po-debconf, systemd-dev
Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://developer.android.com/about/index.html
diff -Nru google-android-installers-1695033340/debian/control.in google-android-installers-1695033340+nmu1/debian/control.in
--- google-android-installers-1695033340/debian/control.in 2023-09-21 09:06:31.0 +0200
+++ google-android-installers-1695033340+nmu1/debian/control.in 2023-12-16 20:09:25.0 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Fab Stz
Uploaders: Roger Shimizu , Mouaad Aallam
-Build-Depends: bash-completion, debhelper-compat (=13), po-debconf
+Build-Depends: bash-completion, debhelper-compat (=13), pkgconf, po-debconf, systemd-dev
Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://developer.android.com/about/index.html
diff -Nru google-android-installers-1695033340/debian/platform-tools.install.in google-android-installers-1695033340+nmu1/debian/platform-tools.install.in
--- google-android-installers-1695033340/debian/platform-tools.install.in 2023-09-21 09:06:31.0 +0200
+++ google-android-installers-1695033340+nmu1/debian/platform-tools.install.in 2023-12-16 20:10:23.0 +0100
@@ -1,4 +1,4 @@
for-postinst/default/Makefile usr/share/google-android-platform-tools-installer/
for-postinst/default/%ZIPFILE%.sha1 usr/share/google-android-platform-tools-installer/
%PATH_DIRNAME%/%PATH_BASENAME%/package.xml usr/share/google-android-platform-tools-installer/
-51-android.rules lib/udev/rules.d
+51-android.rules ${env:deb_udevdir}/rules.d
diff -Nru google-android-installers-1695033340/debian/rules google-android-installers-1695033340+nmu1/debian/rules
--- google-android-installers-1695033340/debian/rules 2023-09-21 09:06:31.0 +0200
+++ google-android-installers-1695033340+nmu1/debian/rules 2023-12-16 20:09:03.0 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
include /usr/share/dpkg/pkg-info.mk
