Browse Source

Packaging cleanup

* Declare compliance with policy 4.5.1
* Bump debhelper compat level to 13 and move binary files around
* Pretty-format files
Christoph Biedl 10 months ago
parent
commit
93d3e25db0
6 changed files with 6 additions and 11 deletions
  1. 1 1
      debian/clevis-systemd.install
  2. 1 1
      debian/clevis-udisks2.install
  3. 0 1
      debian/compat
  4. 2 2
      debian/control
  5. 1 1
      debian/patches/series
  6. 1 5
      debian/rules

+ 1 - 1
debian/clevis-systemd.install

@@ -2,4 +2,4 @@
 lib/systemd/system/clevis-luks-askpass.path
 lib/systemd/system/clevis-luks-askpass.service
 
-usr/lib/*/clevis-luks-askpass
+usr/libexec/clevis-luks-askpass

+ 1 - 1
debian/clevis-udisks2.install

@@ -1,3 +1,3 @@
 
 etc/xdg/autostart/clevis-luks-udisks2.desktop
-usr/lib/*/clevis-luks-udisks2
+usr/libexec/clevis-luks-udisks2

+ 0 - 1
debian/compat

@@ -1 +0,0 @@
-11

+ 2 - 2
debian/control

@@ -1,10 +1,10 @@
 Source: clevis
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://github.com/latchset/clevis
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://git.in-ulm.de/cbiedl/clevis
 Vcs-Git: https://git.in-ulm.de/cbiedl/clevis.git
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
     asciidoctor,
     bash-completion,
     curl,

+ 1 - 1
debian/patches/series

@@ -2,7 +2,7 @@
 # patches for upstream
 upstream.use-asciidoctor-to-build-manpages.patch
 upstream.embed-tpm-modules-in-initramfs.patch
+upstream.embed-more-programs-in-initram.patch
 
 # patches for Debian
-upstream.embed-more-programs-in-initram.patch
 debian.set-unprivileged-user.patch

+ 1 - 5
debian/rules

@@ -7,10 +7,6 @@ include /usr/share/dpkg/buildflags.mk
 %:
 	dh $@  --with=bash-completion
 
-override_dh_missing:
-	dh_missing --fail-missing
-
 override_dh_fixperms:
 	dh_fixperms
-	find debian/clevis-udisks2/usr/lib/*/clevis-luks-udisks2 -type f -print0 | \
-		xargs -r0 chmod u+s
+	chmod u+s debian/clevis-udisks2/usr/libexec/clevis-luks-udisks2