summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/changelog8
-rw-r--r--debian/kexec-tools.dirs2
-rwxr-xr-xdebian/rules4
3 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index eb62257..de400aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kexec-tools (1:2.0.27-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Install programs into canonical locations in /usr. (DEP17 M2)
+ (Closes: #1073031)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Wed, 12 Jun 2024 00:36:59 +0200
+
kexec-tools (1:2.0.27-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/kexec-tools.dirs b/debian/kexec-tools.dirs
index 85c5d86..7124248 100644
--- a/debian/kexec-tools.dirs
+++ b/debian/kexec-tools.dirs
@@ -1,2 +1,2 @@
-sbin
+usr/sbin
etc/default/kexec.d
diff --git a/debian/rules b/debian/rules
index f1e0f54..716901b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ configure-stamp:
dh_testdir
dh_update_autotools_config
dh_autoreconf
- CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" dh_auto_configure -- --prefix=/usr --exec-prefix=/ --sbindir=/sbin --mandir=/usr/share/man --datadir=/usr/share
+ CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" dh_auto_configure -- --prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin --mandir=/usr/share/man --datadir=/usr/share
touch configure-stamp
build: build-arch build-indep
@@ -63,7 +63,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
[ ! -f $(CURDIR)/debian/kexec-tools/usr/lib/kexec-tools-testing/kexec_test.static ] || strip $(CURDIR)/debian/kexec-tools/usr/lib/kexec-tools-testing/kexec_test.static
endif
- install -D -m 0755 debian/kexec-tools/sbin/kexec debian/kexec-tools-udeb/sbin/kexec
+ install -D -m 0755 debian/kexec-tools/usr/sbin/kexec debian/kexec-tools-udeb/usr/sbin/kexec
binary-indep: build install