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.000000000 +0100
+++ ponyprog-3.1.3+ds/debian/changelog	2023-12-16 23:49:15.000000000 +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 <z...@debian.org>  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.000000000 +0100
+++ ponyprog-3.1.3+ds/debian/control	2023-12-16 23:47:55.000000000 +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.000000000 +0100
+++ ponyprog-3.1.3+ds/debian/ponyprog.install	2023-12-16 23:49:08.000000000 +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.000000000 +0100
+++ ponyprog-3.1.3+ds/debian/rules	2023-12-16 23:49:01.000000000 +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)

Reply via email to