Control: tags -1 + pending
Hi,
I've uploaded the patch as an NMU versioned 1.29-11.1. It also
includes the janitor changes from salsa.
The result can be found in the "nmu" branch on salsa, too.
Chris
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 2024-01-26 21:35:30.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 2024-01-26 21:35:30.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 2024-01-26 21:35:30.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 2024-01-26 21:35:30.000000000 +0100
@@ -1,3 +1,20 @@
+adjtimex (1.29-11.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Debian Janitor ]
+ * Remove constraints unnecessary since buster:
+ + Build-Depends: Drop versioned constraint on debhelper.
+ * Bump debhelper dependency to >= 10, since that's what is used in
+ debian/compat.
+
+ [ Chris Hofstaedtler ]
+ * Remove dependency on obsolete lsb-base
+ * Install files into /usr (DEP17 M2). (Closes: #1057016)
+ Update paths.
+
+ -- Chris Hofstaedtler <z...@debian.org> Fri, 26 Jan 2024 21:35:30 +0100
+
adjtimex (1.29-11) unstable; urgency=medium
* debian/patches:
diff -Nru adjtimex-1.29/debian/control adjtimex-1.29/debian/control
--- adjtimex-1.29/debian/control 2021-04-27 17:11:49.000000000 +0200
+++ adjtimex-1.29/debian/control 2024-01-26 21:35:30.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Roger Shimizu <r...@debian.org>
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 10~),
po-debconf
Standards-Version: 3.9.8
Rules-Requires-Root: no
@@ -14,7 +14,6 @@
Package: adjtimex
Architecture: linux-any
Depends:
- lsb-base (>= 3.0-6),
${misc:Depends},
${shlibs:Depends}
Suggests: ntpdate
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 2024-01-26
21:35:30.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 2024-01-26 21:35:30.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
