Browse Source

Packaging cleanup

* Declare compliance with policy 4.6.2
* Bump debhelper compat level to 13
* Set Rule-Requires-Root: no
* Update debian/watch to version 4, and use api.github
* Re-format files in debian/
* Update patch descriptions
Christoph Biedl 2 years ago
parent
commit
cb04e286d2

+ 0 - 1
debian/compat

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

+ 3 - 2
debian/control

@@ -1,15 +1,16 @@
 Source: luksmeta
 Source: luksmeta
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://github.com/latchset/luksmeta
 Homepage: https://github.com/latchset/luksmeta
-Standards-Version: 4.2.0
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.in-ulm.de/cbiedl/luksmeta
 Vcs-Browser: https://git.in-ulm.de/cbiedl/luksmeta
 Vcs-Git: https://git.in-ulm.de/cbiedl/luksmeta.git
 Vcs-Git: https://git.in-ulm.de/cbiedl/luksmeta.git
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
     asciidoctor,
     asciidoctor,
     cryptsetup-bin,
     cryptsetup-bin,
     libcryptsetup-dev (>= 2:1.5.1),
     libcryptsetup-dev (>= 2:1.5.1),
     pkg-config,
     pkg-config,
 Priority: optional
 Priority: optional
+Rules-Requires-Root: no
 Section: net
 Section: net
 
 
 Package: libluksmeta0
 Package: libluksmeta0

+ 1 - 1
debian/patches/local.dont-fail-tests-for-disabled-module-load.patch

@@ -1,8 +1,8 @@
 Description: Don't fail test if cryptsetup fails for disabled module loading
 Description: Don't fail test if cryptsetup fails for disabled module loading
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: 2017-11-20
 Date: 2017-11-20
-Forwarded: not-needed
 Bug-Debian: https://bugs.debian.org/881864
 Bug-Debian: https://bugs.debian.org/881864
+Forwarded: not-needed
 
 
     On the Debian buildds and porter boxes, the crypt_format call in
     On the Debian buildds and porter boxes, the crypt_format call in
     libcryptsetup fails:
     libcryptsetup fails:

+ 1 - 1
debian/patches/local.test-luksmeta.patch

@@ -1,4 +1,4 @@
-Description: Make sure cryptsetup gets found in the tests
+Description: As cryptsetup is not in non-root's path, qualify it
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: 2017-08-31
 Date: 2017-08-31
 Forwarded: not-needed
 Forwarded: not-needed

+ 1 - 1
debian/patches/series

@@ -1,8 +1,8 @@
 # cherry-picked from upstream
 # cherry-picked from upstream
-
 1544448333.v9-1-g9c550e0.relax-content-tests-in-test-suite.patch
 1544448333.v9-1-g9c550e0.relax-content-tests-in-test-suite.patch
 1569669851.v9-3-gaf81262.force-creation-of-luks1-containers-in-test-suite.patch
 1569669851.v9-3-gaf81262.force-creation-of-luks1-containers-in-test-suite.patch
 
 
+# local patches
 local.test-luksmeta.patch
 local.test-luksmeta.patch
 local.dont-fail-tests-for-disabled-module-load.patch
 local.dont-fail-tests-for-disabled-module-load.patch
 local.use-asciidoctor-to-build-manpages.patch
 local.use-asciidoctor-to-build-manpages.patch

+ 3 - 4
debian/rules

@@ -13,12 +13,11 @@ ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	$(MAKE) check
 	$(MAKE) check
 endif
 endif
 
 
-
-override_dh_missing:
-	dh_missing --fail-missing
-
 override_dh_auto_install:
 override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install
 
 
 	# Remove useless files
 	# Remove useless files
 	rm -f debian/tmp/usr/lib/*/*.la
 	rm -f debian/tmp/usr/lib/*/*.la
+
+override_dh_missing:
+	dh_missing --fail-missing

+ 4 - 3
debian/watch

@@ -1,4 +1,5 @@
 
 
-version=3
-https://github.com/latchset/luksmeta/releases \
-    /latchset/luksmeta/releases/download/[^/]+/luksmeta-([0-9][.0-9]*)\.tar\.bz2
+version=4
+opts="searchmode=plain,filenamemangle=s/$/.tar.gz/" \
+https://api.github.com/repos/latchset/@PACKAGE@/releases \
+    /latchset/@PACKAGE@/releases/download/[^/]+/@PACKAGE@-([0-9][.0-9]*)@ARCHIVE_EXT@