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.000000000 +0100
+++ lldpad-1.1+git20221028.aa18720/debian/changelog	2023-12-24 19:32:18.000000000 +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 <z...@debian.org>  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.000000000 +0100
+++ lldpad-1.1+git20221028.aa18720/debian/control	2023-12-24 19:31:45.000000000 +0100
@@ -7,6 +7,7 @@
  Valentin Vidic <vvi...@debian.org>,
  tony mancill <tmanc...@debian.org>
 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.000000000 +0100
+++ lldpad-1.1+git20221028.aa18720/debian/lldpad.install	2023-12-24 19:28:46.000000000 +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.000000000 +0200
+++ lldpad-1.1+git20221028.aa18720/debian/rules	2023-12-24 19:28:39.000000000 +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

Reply via email to