Source: mt-st
Version: 1.7-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Hi!

Your package installs files into /. For the ongoing Debian UsrMerge
effort [1] these files should move to /usr in the trixie cycle.

I'm attaching a patch to implement such a move.

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 mt-st-1.7/debian/changelog mt-st-1.7/debian/changelog
--- mt-st-1.7/debian/changelog	2023-04-20 23:30:00.000000000 +0200
+++ mt-st-1.7/debian/changelog	2023-12-24 20:14:47.000000000 +0100
@@ -1,3 +1,11 @@
+mt-st (1.7-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install all files below /usr, and update references to these files.
+    (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sun, 24 Dec 2023 20:14:47 +0100
+
 mt-st (1.7-1) unstable; urgency=medium
 
   * New upstream release fixing a bug triggered by the test suite on
diff -Nru mt-st-1.7/debian/mt-st.dirs mt-st-1.7/debian/mt-st.dirs
--- mt-st-1.7/debian/mt-st.dirs	2023-04-20 23:30:00.000000000 +0200
+++ mt-st-1.7/debian/mt-st.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-sbin
-bin
-etc
diff -Nru mt-st-1.7/debian/mt-st.files mt-st-1.7/debian/mt-st.files
--- mt-st-1.7/debian/mt-st.files	2023-04-20 23:30:00.000000000 +0200
+++ mt-st-1.7/debian/mt-st.files	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-sbin/stinit
-bin/mt-st
-usr/share/man/man?/*
-etc/stinit.def
diff -Nru mt-st-1.7/debian/mt-st.udev mt-st-1.7/debian/mt-st.udev
--- mt-st-1.7/debian/mt-st.udev	2023-04-20 23:30:00.000000000 +0200
+++ mt-st-1.7/debian/mt-st.udev	2023-12-24 20:13:53.000000000 +0100
@@ -1,3 +1,3 @@
 # Use stinit to set default parameters on st device creation
-KERNEL=="st[0-9]",       RUN+="/sbin/stinit %n"
-KERNEL=="st[0-9]*[0-9]", RUN+="/sbin/stinit %n"
+KERNEL=="st[0-9]",       RUN+="/usr/sbin/stinit %n"
+KERNEL=="st[0-9]*[0-9]", RUN+="/usr/sbin/stinit %n"
diff -Nru mt-st-1.7/debian/rules mt-st-1.7/debian/rules
--- mt-st-1.7/debian/rules	2023-04-20 23:30:00.000000000 +0200
+++ mt-st-1.7/debian/rules	2023-12-24 20:14:47.000000000 +0100
@@ -9,9 +9,9 @@
 	dh $@ --with bash-completion
 
 override_dh_auto_install:
-	install -m 644 debian/stinit.def $(DESTDIR)/etc/
-	install mt $(DESTDIR)/bin/mt-st
-	install stinit $(DESTDIR)/sbin/
+	install -D -m 644 debian/stinit.def $(DESTDIR)/etc/stinit.def
+	install -D mt $(DESTDIR)/usr/bin/mt-st
+	install -D stinit $(DESTDIR)/usr/sbin/stinit
 
 override_dh_installman:
 	cp mt.1 debian/mt-st.1
diff -Nru mt-st-1.7/debian/tests/simple mt-st-1.7/debian/tests/simple
--- mt-st-1.7/debian/tests/simple	2023-04-20 23:30:00.000000000 +0200
+++ mt-st-1.7/debian/tests/simple	2023-12-24 20:14:07.000000000 +0100
@@ -11,8 +11,8 @@
 
 # Symlink the installed binaries
 echo Symlinking the package binaries
-ln -s /bin/mt-st "$AUTOPKGTEST_TMP/mt"
-ln -s /sbin/stinit "$AUTOPKGTEST_TMP/stinit"
+ln -s /usr/bin/mt-st "$AUTOPKGTEST_TMP/mt"
+ln -s /usr/sbin/stinit "$AUTOPKGTEST_TMP/stinit"
 
 # And then run tests
 echo Running tests

Reply via email to