Browse Source

Use asciidoctor to build manpages, and proper dh to install

Christoph Biedl 8 months ago
parent
commit
38adaea142

+ 1 - 0
debian/control

@@ -5,6 +5,7 @@ Standards-Version: 4.6.0
 Vcs-Browser: https://git.in-ulm.de/cbiedl/jose
 Vcs-Git: https://git.in-ulm.de/cbiedl/jose.git
 Build-Depends: debhelper-compat (= 13),
+    asciidoctor,
     libjansson-dev (>= 2.10),
     libssl-dev (>= 1.0.2),
     meson,

+ 0 - 17
debian/jose.install

@@ -1,19 +1,2 @@
 
 usr/bin/jose
-usr/share/man/man1/jose.1
-usr/share/man/man1/jose-alg.1
-usr/share/man/man1/jose-b64-dec.1
-usr/share/man/man1/jose-b64-enc.1
-usr/share/man/man1/jose-jwe-dec.1
-usr/share/man/man1/jose-jwe-enc.1
-usr/share/man/man1/jose-jwe-fmt.1
-usr/share/man/man1/jose-jwk-exc.1
-usr/share/man/man1/jose-jwk-gen.1
-usr/share/man/man1/jose-jwk-pub.1
-usr/share/man/man1/jose-jwk-thp.1
-usr/share/man/man1/jose-jwk-use.1
-usr/share/man/man1/jose-jws-fmt.1
-usr/share/man/man1/jose-jws-sig.1
-usr/share/man/man1/jose-jws-ver.1
-
-usr/share/man/man1/jose-fmt.1

+ 18 - 0
debian/jose.manpages

@@ -0,0 +1,18 @@
+
+usr/share/man/man1/jose.1
+usr/share/man/man1/jose-alg.1
+usr/share/man/man1/jose-b64-dec.1
+usr/share/man/man1/jose-b64-enc.1
+usr/share/man/man1/jose-fmt.1
+usr/share/man/man1/jose-jwe-dec.1
+usr/share/man/man1/jose-jwe-enc.1
+usr/share/man/man1/jose-jwe-fmt.1
+usr/share/man/man1/jose-jwk-eql.1
+usr/share/man/man1/jose-jwk-exc.1
+usr/share/man/man1/jose-jwk-gen.1
+usr/share/man/man1/jose-jwk-pub.1
+usr/share/man/man1/jose-jwk-thp.1
+usr/share/man/man1/jose-jwk-use.1
+usr/share/man/man1/jose-jws-fmt.1
+usr/share/man/man1/jose-jws-sig.1
+usr/share/man/man1/jose-jws-ver.1

+ 29 - 0
debian/patches/debian/2021-11-29.use-asciidoctor-to-build-manpages.patch

@@ -0,0 +1,29 @@
+Subject: Use asciidoctor to build the manpages
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: 2021-11-29
+Forwarded: no
+
+--- a/meson.build
++++ b/meson.build
+@@ -39,7 +39,7 @@
+ threads = dependency('threads')
+ jansson = dependency('jansson', version: '>=2.10')
+ libcrypto = dependency('libcrypto', version: '>=1.0.2')
+-a2x = find_program('a2x', required: false)
++asciidoctor = find_program('asciidoctor', required: false)
+ 
+ mans = []
+ 
+@@ -65,10 +65,10 @@
+   requires: 'jansson',
+ )
+ 
+-if a2x.found()
++if asciidoctor.found()
+   foreach m : mans
+     custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1],
+-      command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'],
++      command: [asciidoctor, '--attribute', 'reproducible', '--backend=manpage', '-D', meson.current_build_dir(), '@INPUT@'],
+       install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]),
+       install: true
+     )

+ 3 - 0
debian/patches/series

@@ -2,3 +2,6 @@
 # cherry-picked commits. Keep in upstream's chronological order
 
 # patches for upstream
+
+# patches for Debian
+debian/2021-11-29.use-asciidoctor-to-build-manpages.patch