Source: quota
Version: 4.06-1
Severity: normal
Tags: patch moreinfo
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

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

I'm attaching a mostly mechanical patch to implement that. Please
review, test and upload at your earliest convenience. Also see the
wiki about uploading to experimental first, and to unstable after a
few days.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.

Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru quota-4.06/debian/changelog quota-4.06/debian/changelog
--- quota-4.06/debian/changelog	2021-02-09 13:22:57.000000000 +0100
+++ quota-4.06/debian/changelog	2023-12-21 01:16:34.000000000 +0100
@@ -1,3 +1,11 @@
+quota (4.06-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install binary programs into /usr/sbin. (Closes: #-1)
+  * Update paths to /usr/sbin in (init) scripts, systemd service.
+
+ -- Chris Hofstaedtler <z...@debian.org>  Thu, 21 Dec 2023 01:16:34 +0100
+
 quota (4.06-1) unstable; urgency=medium
 
   * New upstream version 4.06
diff -Nru quota-4.06/debian/dirs quota-4.06/debian/dirs
--- quota-4.06/debian/dirs	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/dirs	2023-12-21 01:16:34.000000000 +0100
@@ -1,6 +1,5 @@
 usr/bin
 usr/sbin
-sbin
 etc/init.d
 usr/share/man/man1
 usr/share/man/man2
diff -Nru quota-4.06/debian/quota.init quota-4.06/debian/quota.init
--- quota-4.06/debian/quota.init	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/quota.init	2023-12-21 01:16:34.000000000 +0100
@@ -13,7 +13,7 @@
 DESC="quota service"
 
 # names of binaries
-on=/sbin/quotaon
+on=/usr/sbin/quotaon
 
 set -e
 
diff -Nru quota-4.06/debian/quota-initial-check.sh quota-4.06/debian/quota-initial-check.sh
--- quota-4.06/debian/quota-initial-check.sh	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/quota-initial-check.sh	2023-12-21 01:16:34.000000000 +0100
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # names of binaries
-check=/sbin/quotacheck
-on=/sbin/quotaon
+check=/usr/sbin/quotacheck
+on=/usr/sbin/quotaon
 quotaisnew=/var/lib/quota/new
 
 ALLFLAGS=-aug
diff -Nru quota-4.06/debian/quotaoff.sh quota-4.06/debian/quotaoff.sh
--- quota-4.06/debian/quotaoff.sh	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/quotaoff.sh	2023-12-21 01:16:34.000000000 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # names of binaries
-off=/sbin/quotaoff
+off=/usr/sbin/quotaoff
 quotaisoff=/var/lib/quota/off
 ALLFLAGS=-aug
 
diff -Nru quota-4.06/debian/quotaon.sh quota-4.06/debian/quotaon.sh
--- quota-4.06/debian/quotaon.sh	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/quotaon.sh	2023-12-21 01:16:34.000000000 +0100
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # names of binaries
-check=/sbin/quotacheck
-on=/sbin/quotaon
+check=/usr/sbin/quotacheck
+on=/usr/sbin/quotaon
 quotaisoff=/var/lib/quota/off
 quotaisnew=/var/lib/quota/new
 forcequotacheck=/forcequotacheck
diff -Nru quota-4.06/debian/quotarpc.service quota-4.06/debian/quotarpc.service
--- quota-4.06/debian/quotarpc.service	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/quotarpc.service	2023-12-21 01:16:34.000000000 +0100
@@ -5,7 +5,7 @@
 PartOf=nfs-server.target
 After=rpcbind.service
 Before=nfs-server.target
-ConditionFileIsExecutable=/sbin/rpcbind
+ConditionFileIsExecutable=/usr/sbin/rpcbind
  
 [Service]
 Type=forking
diff -Nru quota-4.06/debian/rules quota-4.06/debian/rules
--- quota-4.06/debian/rules	2021-02-09 13:05:00.000000000 +0100
+++ quota-4.06/debian/rules	2023-12-21 01:16:23.000000000 +0100
@@ -57,10 +57,6 @@
 	# Add here commands to install the package into debian/quota.
 	$(MAKE) DESTDIR=`pwd`/debian/quota install
 
-	-mv `pwd`/debian/quota/usr/sbin/quotacheck `pwd`/debian/quota/sbin
-	-mv `pwd`/debian/quota/usr/sbin/quotaon `pwd`/debian/quota/sbin
-	-mv `pwd`/debian/quota/usr/sbin/quotaoff `pwd`/debian/quota/sbin
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Reply via email to