Package: adjtimex
Version: 1.29-11+b1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package adjtimex ships files in /lib and /sbin. For the ongoing
UsrMerge effort [1] these directories should become "empty", IOW
packages should not install files there, but instead into the respective
directories in /usr.
It seems to me that adjtimex could move these files now. I'm attaching a
patch, that seems to work for me. However, please read the linked wiki
page and upload to experimental first, to receive info about problems
from "dumat" (also see [1]).
Also note, any backports to bookworm or earlier should undo these
changes.
Thanks for considering,
Chris
1. https://wiki.debian.org/UsrMerge
diff -Nru adjtimex-1.29/debian/adjtimex.init adjtimex-1.29/debian/adjtimex.init
--- adjtimex-1.29/debian/adjtimex.init 2021-04-27 17:11:49.000000000 +0200
+++ adjtimex-1.29/debian/adjtimex.init 2023-11-28 00:11:28.000000000 +0100
@@ -16,7 +16,7 @@
. /lib/lsb/init-functions
-test -x /sbin/adjtimex || exit 0
+test -x /usr/sbin/adjtimex || exit 0
# default values
TICK=10000
@@ -31,7 +31,7 @@
case "$1" in
start|restart|force-reload)
echo -n "Regulating system clock..."
- /sbin/adjtimex -tick "$TICK" -frequency "$FREQ"
+ /usr/sbin/adjtimex -tick "$TICK" -frequency "$FREQ"
echo "done."
;;
stop|status)
diff -Nru adjtimex-1.29/debian/adjtimex.install
adjtimex-1.29/debian/adjtimex.install
--- adjtimex-1.29/debian/adjtimex.install 2021-04-27 17:11:49.000000000
+0200
+++ adjtimex-1.29/debian/adjtimex.install 2023-11-28 00:11:43.000000000
+0100
@@ -1,3 +1,3 @@
-adjtimex sbin
+adjtimex usr/sbin
debian/adjtimexconfig usr/sbin
debian/contrib/ntp-drift_to_freq.sh usr/share/doc/adjtimex/contrib
diff -Nru adjtimex-1.29/debian/adjtimex.service
adjtimex-1.29/debian/adjtimex.service
--- adjtimex-1.29/debian/adjtimex.service 2021-04-27 17:11:49.000000000
+0200
+++ adjtimex-1.29/debian/adjtimex.service 2023-11-28 00:11:16.000000000
+0100
@@ -10,7 +10,7 @@
Type=oneshot
Environment="TICK=10000" "FREQ=0"
EnvironmentFile=-/etc/default/adjtimex
-ExecStart=/sbin/adjtimex -tick ${TICK} -frequency ${FREQ}
+ExecStart=/usr/sbin/adjtimex -tick ${TICK} -frequency ${FREQ}
[Install]
WantedBy=sysinit.target
diff -Nru adjtimex-1.29/debian/changelog adjtimex-1.29/debian/changelog
--- adjtimex-1.29/debian/changelog 2021-04-27 17:11:49.000000000 +0200
+++ adjtimex-1.29/debian/changelog 2023-11-28 00:11:43.000000000 +0100
@@ -1,3 +1,10 @@
+adjtimex (1.29-11.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files from /lib, /sbin to /usr/lib, /usr/sbin. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org> Tue, 28 Nov 2023 00:11:43 +0100
+
adjtimex (1.29-11) unstable; urgency=medium
* debian/patches:
diff -Nru adjtimex-1.29/debian/patches/12-makefile.in-bindir.patch
adjtimex-1.29/debian/patches/12-makefile.in-bindir.patch
--- adjtimex-1.29/debian/patches/12-makefile.in-bindir.patch 1970-01-01
01:00:00.000000000 +0100
+++ adjtimex-1.29/debian/patches/12-makefile.in-bindir.patch 2023-11-28
00:11:43.000000000 +0100
@@ -0,0 +1,13 @@
+Index: adjtimex-1.29/Makefile.in
+===================================================================
+--- adjtimex-1.29.orig/Makefile.in
++++ adjtimex-1.29/Makefile.in
+@@ -9,7 +9,7 @@ CFLAGS += @CFLAGS@ -Wall
+ prefix = @prefix@
+ man1dir=@mandir@/man1
+ exec_prefix = @exec_prefix@
+-bindir=/sbin
++bindir= @exec_prefix@/sbin
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
diff -Nru adjtimex-1.29/debian/patches/series
adjtimex-1.29/debian/patches/series
--- adjtimex-1.29/debian/patches/series 2021-04-27 17:11:49.000000000 +0200
+++ adjtimex-1.29/debian/patches/series 2023-11-28 00:10:09.000000000 +0100
@@ -9,3 +9,4 @@
09-adjtimex.8-Some-fixes-to-the-manual.patch
10-STA_NANO-confuses-adjtimex-8.patch
11-Fix-ntpdate-command.patch
+12-makefile.in-bindir.patch
