Browse Source

Use jq in the test suite

Christoph Biedl 8 months ago
parent
commit
75fe28474b

+ 1 - 0
debian/control

@@ -6,6 +6,7 @@ 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,
+    jq,
     libjansson-dev (>= 2.10),
     libssl-dev (>= 1.0.2),
     meson,

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

@@ -11,10 +11,10 @@ Forwarded: no
  libcrypto = dependency('libcrypto', version: '>=1.0.2')
 -a2x = find_program('a2x', required: false)
 +asciidoctor = find_program('asciidoctor', required: false)
+ jq = find_program('jq', required: false)
  
  mans = []
- 
-@@ -65,10 +65,10 @@
+@@ -66,10 +66,10 @@
    requires: 'jansson',
  )
  

+ 15 - 0
debian/patches/for-upstream/2021-12-01.probe-for-jq.patch

@@ -0,0 +1,15 @@
+Subject: Probe for jq
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: 2021-12-01
+Forwarded: https://github.com/latchset/jose/issues/109
+
+--- a/meson.build
++++ b/meson.build
+@@ -40,6 +40,7 @@
+ jansson = dependency('jansson', version: '>=2.10')
+ libcrypto = dependency('libcrypto', version: '>=1.0.2')
+ a2x = find_program('a2x', required: false)
++jq = find_program('jq', required: false)
+ 
+ mans = []
+ 

+ 1 - 0
debian/patches/series

@@ -3,6 +3,7 @@
 
 # patches for upstream
 for-upstream/2021-12-01.replace-usage-of-which.patch
+for-upstream/2021-12-01.probe-for-jq.patch
 
 # patches for Debian
 debian/2021-11-29.use-asciidoctor-to-build-manpages.patch

+ 1 - 0
debian/tests/control

@@ -2,6 +2,7 @@ Tests: run-testsuite
 Depends:
     @,
     build-essential,
+    jq,
     libjansson-dev,
     libjose-dev,
     moreutils,