Bug#1058769: amazon-ec2-net-utils: please move systemd service files (again)

[Chris Hofstaedtler <zeha@debian.org>]

Package: amazon-ec2-net-utils
Version: 2.4.1-1
Severity: normal
Tags: patch
User: helmutg@debian.org
Usertags: dep17m2


Dear maintainer,

please move the systemd service files back into /usr, for the
currently ongoing UsrMerge effort [1].

Moving systemd service files is safe, even now.

Attached is a trivial, tested patch for your convenience. This
assumes amazon-ec2-net-utils does not get backports to bookworm or
earlier. If you backport, please revert the move in the backport.

If you restructure your package during the trixie cycle, please
consult the wiki [1] and upload to experimental first.


Thanks,
Chris



[1] https://wiki.debian.org/UsrMerge

diff -Nru amazon-ec2-net-utils-2.4.1/debian/changelog amazon-ec2-net-utils-2.4.1/debian/changelog
--- amazon-ec2-net-utils-2.4.1/debian/changelog	2023-10-26 05:38:56.000000000 +0200
+++ amazon-ec2-net-utils-2.4.1/debian/changelog	2023-12-15 22:55:59.000000000 +0100
@@ -1,3 +1,10 @@
+amazon-ec2-net-utils (2.4.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd services again into default location.
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Fri, 15 Dec 2023 22:55:59 +0100
+
 amazon-ec2-net-utils (2.4.1-1) unstable; urgency=medium
 
   * New upstream release 2.4.1
diff -Nru amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes
--- amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes	2023-10-26 05:38:56.000000000 +0200
+++ amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes	2023-12-15 22:55:59.000000000 +0100
@@ -1,16 +1,3 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index ced341b221079b2a70b18085af7eac119f02174c..56c9b119b7a5bef49f8ce5f730bb5b68ca3e3cce 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -6,7 +6,7 @@ PREFIX?=/usr/local
- BINDIR=${DESTDIR}${PREFIX}/bin
- UDEVDIR=${DESTDIR}/usr/lib/udev/rules.d
- SYSTEMDDIR=${DESTDIR}/usr/lib/systemd
--SYSTEMD_SYSTEM_DIR=${SYSTEMDDIR}/system
-+SYSTEMD_SYSTEM_DIR=${DESTDIR}/lib/systemd/system
- SYSTEMD_NETWORK_DIR=${SYSTEMDDIR}/network
- SHARE_DIR=${DESTDIR}/${PREFIX}/share/${pkgname}
- 
 diff --git a/lib/lib.sh b/lib/lib.sh
 index 3a82e288100cb9a396758e9d7138d97f32eaaa74..336fa25417bcae82886b16126c7a9efb246e0602 100644
 --- a/lib/lib.sh