[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1036014: unblock: amazon-ec2-utils/2.0.1-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-cloud@lists.debian.org

Dear Release Team,

As one of the owners of udev, and having an agreement with the
maintainer of amazon-ec2-utils, I'd like the following bug fixed in
Bookworm:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1035667

amazon-ec2-utils used to take over a file from udev, and this has been
fixed in the latest upload to unstable. For maintainability and
supportability reasons, we the systemd/udev maintainers prefer that
files from the udev package are not diverted. This is the only such
case distro-wide.

The change is very straightforward and restricted to the maintainer
scripts and the install file. Debdiff attached.

Thank you!

-- 
Kind regards,
Luca Boccassi
diff -Nru amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.install amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.install
--- amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.install	2022-12-23 22:15:25.000000000 +0000
+++ amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.install	2023-05-13 01:11:47.000000000 +0100
@@ -1,4 +1,4 @@
 ebsnvme-id /usr/sbin/
 ec2-metadata /usr/bin/
 ec2nvme-nsid /lib/udev/
-60-cdrom_id.rules 70-ec2-nvme-devices.rules /lib/udev/rules.d/
+70-ec2-nvme-devices.rules /lib/udev/rules.d/
diff -Nru amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postinst amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postinst
--- amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postinst	1970-01-01 01:00:00.000000000 +0100
+++ amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postinst	2023-05-13 01:11:47.000000000 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "configure" = "$1" ]; then
+	# TODO: can be dropped in Trixie
+	diverter=$(dpkg-divert --listpackage /lib/udev/rules.d/60-cdrom_id.rules)
+	if [ "$diverter" = "amazon-ec2-utils" ]; then
+		dpkg-divert --package amazon-ec2-utils --remove --rename \
+			--divert /lib/udev/rules.d/60-cdrom_id.rules.disabled \
+			/lib/udev/rules.d/60-cdrom_id.rules
+	fi
+fi
+
+#DEBHELPER#
diff -Nru amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postrm amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postrm
--- amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postrm	2022-12-23 22:01:44.000000000 +0000
+++ amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then
-      dpkg-divert --package amazon-ec2-utils --remove --rename \
-      	       --divert /lib/udev/rules.d/60-cdrom_id.rules.disabled \
-	       /lib/udev/rules.d/60-cdrom_id.rules
-fi
-
-#DEBHELPER#
diff -Nru amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.preinst amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.preinst
--- amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.preinst	2022-12-23 22:01:44.000000000 +0000
+++ amazon-ec2-utils-2.0.1/debian/amazon-ec2-utils.preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dpkg-divert --package amazon-ec2-utils --add --rename \
-	    --divert /lib/udev/rules.d/60-cdrom_id.rules.disabled \
-	    /lib/udev/rules.d/60-cdrom_id.rules
-
-#DEBHELPER#
diff -Nru amazon-ec2-utils-2.0.1/debian/changelog amazon-ec2-utils-2.0.1/debian/changelog
--- amazon-ec2-utils-2.0.1/debian/changelog	2022-12-23 22:17:54.000000000 +0000
+++ amazon-ec2-utils-2.0.1/debian/changelog	2023-05-13 01:11:47.000000000 +0100
@@ -1,3 +1,10 @@
+amazon-ec2-utils (2.0.1-2) unstable; urgency=medium
+
+  [ Luca Boccassi ]
+  * Remove diversion of udev rule 60-cdrom_id.rules (Closes: #1035667)
+
+ -- Noah Meyerhans <noahm@debian.org>  Fri, 12 May 2023 17:11:47 -0700
+
 amazon-ec2-utils (2.0.1-1) unstable; urgency=medium
 
   * New upstream release

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: