Issue 1445 (#1454)

Upgrade jq to 1.7: * Upgrade jq to 1.7 (Debian/Ubuntu) untested. #1445 * Fix test regression. #1445 * Remove integer patch from PyJQ. #1445 * Overhaul of jq for Debian (11). #1445 * Added missing jq dependency. #1445 * Fixed a test regression. #1445 * Added trivial jq transforms to archiving in troubleshooter. #1445
perfsonar · Jul 2, 2024 · d838bbf · d838bbf
1 parent 5a35142
commit d838bbf
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 9,080 deletions.
diff --git a/jq/jq-1.6.0.tar.gz b/jq/jq-1.6.0.tar.gz
diff --git a/jq/jq-1.6.tar.gz b/jq/jq-1.6.tar.gz
diff --git a/jq/jq-1.7.1.tar.gz b/jq/jq-1.7.1.tar.gz
diff --git a/jq/unibuild-packaging/deb/changelog b/jq/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+jq (1.7.1-1~bpo8+3) perfsonar-5.2-staging; urgency=medium
+
+  * New upstream version
+
+ -- Lætitia Delvaux <[email protected]>  Tue, 23 Apr 2024 01:02:58 +0200 
+
 jq (1.6.0-1~bpo8+3) perfsonar-5.1-staging; urgency=medium
 
   * Building on Ubuntu 20.

diff --git a/jq/unibuild-packaging/deb/compat b/jq/unibuild-packaging/deb/compat
@@ -1 +1 @@
-9
+10
diff --git a/jq/unibuild-packaging/deb/control b/jq/unibuild-packaging/deb/control
@@ -2,7 +2,8 @@ Source: jq
 Section: utils
 Priority: optional
 Maintainer: ChangZhuo Chen (陳昌倬) <[email protected]>
-Build-Depends: debhelper (>= 10), dh-autoreconf, flex, bison, libtool-bin, valgrind [amd64 i386], rake, ruby-ronn, libonig-dev
+Build-Depends: debhelper (>= 10), dh-autoreconf, flex, bison, libtool-bin, valgrind [amd64 i386], rake, ruby-ronn, libonig-dev,
+ python3-lxml, python3-markdown, python3-yaml
 Standards-Version: 3.9.6
 Homepage: https://github.com/stedolan/jq
 Vcs-Git: git://anonscm.debian.org/users/else-guest/jq.git

diff --git a/jq/unibuild-packaging/deb/jq.docs b/jq/unibuild-packaging/deb/jq.docs
diff --git a/jq/unibuild-packaging/deb/libjq1.symbols b/jq/unibuild-packaging/deb/libjq1.symbols
diff --git a/jq/unibuild-packaging/deb/patches/disable-static-libtool.patch b/jq/unibuild-packaging/deb/patches/disable-static-libtool.patch
diff --git a/jq/unibuild-packaging/deb/patches/dont-distribute-duplicate-docs.patch b/jq/unibuild-packaging/deb/patches/dont-distribute-duplicate-docs.patch
diff --git a/jq/unibuild-packaging/deb/patches/enable-manpages.patch b/jq/unibuild-packaging/deb/patches/enable-manpages.patch
diff --git a/jq/unibuild-packaging/deb/patches/jv_is_integer_large.patch b/jq/unibuild-packaging/deb/patches/jv_is_integer_large.patch
diff --git a/jq/unibuild-packaging/deb/patches/patch-version-into-build.patch b/jq/unibuild-packaging/deb/patches/patch-version-into-build.patch
diff --git a/jq/unibuild-packaging/deb/patches/series b/jq/unibuild-packaging/deb/patches/series
diff --git a/jq/unibuild-packaging/deb/rules b/jq/unibuild-packaging/deb/rules
@@ -15,27 +15,24 @@ get-orig-source:
 
 # This target replaces the version script with one that doesn't get
 # the wrong answer by depending on git.
-_fix-version:
-	printf "#!/bin/sh -e\necho '%s.10+pscheduler-patches'\n" \
-		$$(./configure --version | head -1 | sed -e "s/^[^']*'//g; s/'.*\$$//g") \
+_fix-version: libjq.pc
+	printf '#!/bin/sh -e \necho %s\n' "$$(awk '$$1 == "Version:" { print $$2 }' libjq.pc | head -1)" \
 		> ./scripts/version
 
+
 override_dh_auto_configure: _fix-version
-	cd docs && rake manpage > ../jq.1
 	dh_auto_configure -- --disable-static --disable-fpectl --without-fpectl
 
-override_dh_auto_test:
 
-override_dh_auto_clean:
-	dh_auto_clean
-	test ! -f ./jq.1.old || mv ./jq.1.old jq.1
+override_dh_installdocs:
+	cd docs && ./build_manpage.py > jq.1
+	dh_installdocs
 
-override_dh_install:
-	dh_install --list-missing
 
 %:
 	dh $@ --with autoreconf
 
+
 # Ubuntu dbgsym.ddeb are currently not supported by reprepro
 override_dh_strip:
 	dh_strip --no-automatic-dbgsym