Package: netscript-2.4,netstcript-ipfilter
Version: 5.5.5+nmu1
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge transition via DEP17 by moving all
aliased files from / to /usr to avoid negative effects arising from
aliasing. netscript-2.4 is involved, because it installs multiple files
in aliased locations. As it uses debhelper for installing systemd units,
those will move automatically on the next upload. Programs and udev
files will not move automatically though and dh-sequence-movetousr does
not just work for netscript-2.4. Therefore, I am sending a patch to
perform the move. Note that this patch must not be uploaded to
bookworm-backports or earlier, because it would violate the file move
moratorium there.

Helmut
diff --minimal -Nru netscript-2.4-5.5.5+nmu1/debian/changelog 
netscript-2.4-5.5.5+nmu2/debian/changelog
--- netscript-2.4-5.5.5+nmu1/debian/changelog   2022-10-15 12:26:24.000000000 
+0200
+++ netscript-2.4-5.5.5+nmu2/debian/changelog   2024-02-18 12:00:53.000000000 
+0100
@@ -1,3 +1,10 @@
+netscript-2.4 (5.5.5+nmu2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * DEP17: Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sun, 18 Feb 2024 12:00:53 +0100
+
 netscript-2.4 (5.5.5+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru netscript-2.4-5.5.5+nmu1/debian/netscript-2.4.links 
netscript-2.4-5.5.5+nmu2/debian/netscript-2.4.links
--- netscript-2.4-5.5.5+nmu1/debian/netscript-2.4.links 2015-01-04 
04:54:23.000000000 +0100
+++ netscript-2.4-5.5.5+nmu2/debian/netscript-2.4.links 2024-02-18 
12:00:34.000000000 +0100
@@ -4,5 +4,5 @@
 usr/share/man/man5/netscript-2.4.conf.5.gz 
usr/share/man/man5/ipfilter.conf.5.gz
 usr/share/man/man8/netscript.8.gz usr/share/man/man8/ifup.8.gz
 usr/share/man/man8/netscript.8.gz usr/share/man/man8/ifdown.8.gz
-sbin/netscript sbin/ifup
-sbin/netscript sbin/ifdown
+usr/sbin/netscript usr/sbin/ifup
+usr/sbin/netscript usr/sbin/ifdown
diff --minimal -Nru netscript-2.4-5.5.5+nmu1/debian/rules 
netscript-2.4-5.5.5+nmu2/debian/rules
--- netscript-2.4-5.5.5+nmu1/debian/rules       2018-01-18 10:27:36.000000000 
+0100
+++ netscript-2.4-5.5.5+nmu2/debian/rules       2024-02-18 12:00:09.000000000 
+0100
@@ -33,8 +33,8 @@
        dh_installdirs
 
        # Add here commands to install the package into debian/<package>.
-       $(MAKE) install DESTDIR=`pwd`/debian/netscript-2.4
-       $(MAKE) install-ipfilter DESTDIR=`pwd`/debian/netscript-ipfilter
+       $(MAKE) install DESTDIR=`pwd`/debian/netscript-2.4 
SBINDIR='$$(DESTDIR)/usr/sbin' UDEVLIBDIR='$$(DESTDIR)/usr/lib/udev'
+       $(MAKE) install-ipfilter DESTDIR=`pwd`/debian/netscript-ipfilter 
SBINDIR='$$(DESTDIR)/usr/sbin' UDEVLIBDIR='$$(DESTDIR)/usr/lib/udev'
 
 
 # Build architecture-independent files here.

Reply via email to