Bug#1057742: amazon-ec2-utils: delegate placement of udev files to udev.pc

2023-12-07 Thread Chris Hofstaedtler
> Attached you will find a patch to delegate the exact placement of
> the udev files to udev.pc (using pkg-config). 

Please find a corrected patch attached.

Chris

diff -Nru amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install
--- amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install	2023-09-30 00:40:28.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install	2023-12-07 22:35:46.0 +0100
@@ -1,4 +1,4 @@
 ebsnvme-id /usr/sbin/
 ec2-metadata /usr/bin/
-ec2nvme-nsid /lib/udev/
-70-ec2-nvme-devices.rules /lib/udev/rules.d/
+ec2nvme-nsid ${env:deb_udevdir}/
+70-ec2-nvme-devices.rules ${env:deb_udevdir}/rules.d/
diff -Nru amazon-ec2-utils-2.1.0/debian/changelog amazon-ec2-utils-2.1.0/debian/changelog
--- amazon-ec2-utils-2.1.0/debian/changelog	2023-09-30 01:18:53.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/changelog	2023-12-07 22:35:46.0 +0100
@@ -1,3 +1,10 @@
+amazon-ec2-utils (2.1.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev files to udev.pc
+
+ -- Chris Hofstaedtler   Thu, 07 Dec 2023 22:35:46 +0100
+
 amazon-ec2-utils (2.1.0-1) unstable; urgency=medium
 
   * New upstream release 2.1.0
diff -Nru amazon-ec2-utils-2.1.0/debian/control amazon-ec2-utils-2.1.0/debian/control
--- amazon-ec2-utils-2.1.0/debian/control	2023-09-30 00:40:28.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/control	2023-12-07 22:35:46.0 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Cloud Team 
 Uploaders: Noah Meyerhans 
-Build-Depends: debhelper-compat (= 12)
+Build-Depends: debhelper-compat (= 13), pkgconf, systemd-dev
 Standards-Version: 4.5.0
 Homepage: https://github.com/aws/amazon-ec2-utils
 Vcs-Browser: https://salsa.debian.org/cloud-team/amazon-ec2-utils
diff -Nru amazon-ec2-utils-2.1.0/debian/rules amazon-ec2-utils-2.1.0/debian/rules
--- amazon-ec2-utils-2.1.0/debian/rules	2023-09-30 00:40:28.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/rules	2023-12-07 22:35:46.0 +0100
@@ -3,5 +3,7 @@
 # output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev)
+
 %:
 	dh $@


Bug#1057742: amazon-ec2-utils: delegate placement of udev files to udev.pc

2023-12-07 Thread Chris Hofstaedtler
Source: amazon-ec2-utils
Version: 2.1.0-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs files related to udev, into /lib/udev. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].

Attached you will find a patch to delegate the exact placement of
the udev files to udev.pc (using pkg-config). This should work today
in unstable and, if necessary, for bookworm. Once udev.pc in
unstable points to /usr/lib your package will benefit automatically
after a binNMU or any other upload.

Later during the trixie cycle I expect this bug class to raise in
priority.

Per the wiki, it is advisable to upload to experimental first, and
wait a few days for the dumat tool to check your package. The same
is advisable when any structural changes are done in the trixie
cycle.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install
--- amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install	2023-09-30 00:40:28.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/amazon-ec2-utils.install	2023-12-07 22:35:46.0 +0100
@@ -1,4 +1,4 @@
 ebsnvme-id /usr/sbin/
 ec2-metadata /usr/bin/
-ec2nvme-nsid /lib/udev/
-70-ec2-nvme-devices.rules /lib/udev/rules.d/
+ec2nvme-nsid ${env:deb_udevdir}
+70-ec2-nvme-devices.rules ${env:deb_udevdir}
diff -Nru amazon-ec2-utils-2.1.0/debian/changelog amazon-ec2-utils-2.1.0/debian/changelog
--- amazon-ec2-utils-2.1.0/debian/changelog	2023-09-30 01:18:53.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/changelog	2023-12-07 22:35:46.0 +0100
@@ -1,3 +1,10 @@
+amazon-ec2-utils (2.1.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev files to udev.pc
+
+ -- Chris Hofstaedtler   Thu, 07 Dec 2023 22:35:46 +0100
+
 amazon-ec2-utils (2.1.0-1) unstable; urgency=medium
 
   * New upstream release 2.1.0
diff -Nru amazon-ec2-utils-2.1.0/debian/control amazon-ec2-utils-2.1.0/debian/control
--- amazon-ec2-utils-2.1.0/debian/control	2023-09-30 00:40:28.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/control	2023-12-07 22:35:46.0 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Cloud Team 
 Uploaders: Noah Meyerhans 
-Build-Depends: debhelper-compat (= 12)
+Build-Depends: debhelper-compat (= 13), pkgconf, systemd-dev
 Standards-Version: 4.5.0
 Homepage: https://github.com/aws/amazon-ec2-utils
 Vcs-Browser: https://salsa.debian.org/cloud-team/amazon-ec2-utils
diff -Nru amazon-ec2-utils-2.1.0/debian/rules amazon-ec2-utils-2.1.0/debian/rules
--- amazon-ec2-utils-2.1.0/debian/rules	2023-09-30 00:40:28.0 +0200
+++ amazon-ec2-utils-2.1.0/debian/rules	2023-12-07 22:35:46.0 +0100
@@ -3,5 +3,7 @@
 # output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev)
+
 %:
 	dh $@