Package: jq Version: 1.5+dfsg-1.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for jq (versioned as 1.5+dfsg-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. diff -Nru jq-1.5+dfsg/debian/changelog jq-1.5+dfsg/debian/changelog --- jq-1.5+dfsg/debian/changelog 2016-11-13 19:48:12.000000000 -0500 +++ jq-1.5+dfsg/debian/changelog 2016-12-27 19:04:39.000000000 -0500 @@ -1,3 +1,12 @@ +jq (1.5+dfsg-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix double-build failure. (Closes: #802218) + * Add new packages for jq library (Closes: #833213) + * Correct description to be more accurate (Closes: #824810) + + -- Harlan Lieberman-Berg <hlieber...@debian.org> Tue, 27 Dec 2016 19:04:39 -0500 + jq (1.5+dfsg-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru jq-1.5+dfsg/debian/control jq-1.5+dfsg/debian/control --- jq-1.5+dfsg/debian/control 2016-11-26 20:54:42.000000000 -0500 +++ jq-1.5+dfsg/debian/control 2016-12-27 19:04:39.000000000 -0500 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Simon Elsbrock <si...@iodev.org> -Build-Depends: debhelper (>= 9), dh-autoreconf, flex, bison, valgrind [amd64 i386], rake, ruby-ronn, libonig-dev +Build-Depends: debhelper (>= 9), dh-autoreconf, flex, bison, libtool-bin, valgrind [amd64 i386], rake, ruby-ronn, libonig-dev Standards-Version: 3.9.6 Homepage: https://github.com/stedolan/jq Vcs-Git: git://anonscm.debian.org/users/else-guest/jq.git @@ -18,7 +18,7 @@ the same ease that sed, awk, grep and friends let you play with text. . - It is written in portable C, and it has zero runtime + It is written in portable C, and it has minimal runtime dependencies. . jq can mangle the data format that you have into the @@ -26,18 +26,17 @@ program to do so is often shorter and simpler than you’d expect. -Package: libjq-dev +Package: libjq1 Architecture: any -Multi-Arch: foreign -Section: libdevel +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Description: development files for jq, the lightweight JSON processor +Description: lightweight and flexible command-line JSON processor - shared library jq is like sed for JSON data – you can use it to slice and filter and map and transform structured data with the same ease that sed, awk, grep and friends let you play with text. . - It is written in portable C, and it has zero runtime + It is written in portable C, and it has minimal runtime dependencies. . jq can mangle the data format that you have into the @@ -45,19 +44,20 @@ program to do so is often shorter and simpler than you’d expect. . - This package contains the development files for jq. + This package contains the shared library. -Package: libjq1 -Section: libs +Package: libjq-dev +Section: libdevel Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Description: library for jq, the lightweight JSON processor +Description: lightweight and flexible command-line JSON processor - development files jq is like sed for JSON data – you can use it to slice and filter and map and transform structured data with the same ease that sed, awk, grep and friends let you play with text. . - It is written in portable C, and it has zero runtime + It is written in portable C, and it has minimal runtime dependencies. . jq can mangle the data format that you have into the @@ -65,4 +65,4 @@ program to do so is often shorter and simpler than you’d expect. . - This package contains the library for jq. + This package contains the development files. diff -Nru jq-1.5+dfsg/debian/docs jq-1.5+dfsg/debian/docs --- jq-1.5+dfsg/debian/docs 2016-11-13 19:27:52.000000000 -0500 +++ jq-1.5+dfsg/debian/docs 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -README diff -Nru jq-1.5+dfsg/debian/jq.docs jq-1.5+dfsg/debian/jq.docs --- jq-1.5+dfsg/debian/jq.docs 1969-12-31 19:00:00.000000000 -0500 +++ jq-1.5+dfsg/debian/jq.docs 2016-12-27 19:00:48.000000000 -0500 @@ -0,0 +1,2 @@ +README +AUTHORS diff -Nru jq-1.5+dfsg/debian/jq.install jq-1.5+dfsg/debian/jq.install --- jq-1.5+dfsg/debian/jq.install 2016-11-26 20:54:20.000000000 -0500 +++ jq-1.5+dfsg/debian/jq.install 2016-12-27 19:00:48.000000000 -0500 @@ -1,3 +1,2 @@ usr/bin/jq usr/share/man/man1/jq.1 -usr/share/doc/jq \ No newline at end of file diff -Nru jq-1.5+dfsg/debian/libjq1.install jq-1.5+dfsg/debian/libjq1.install --- jq-1.5+dfsg/debian/libjq1.install 2016-11-26 20:52:58.000000000 -0500 +++ jq-1.5+dfsg/debian/libjq1.install 2016-12-27 19:00:48.000000000 -0500 @@ -1 +1 @@ -usr/lib/*/lib*.so.* \ No newline at end of file +usr/lib/*/libjq.so.* diff -Nru jq-1.5+dfsg/debian/libjq-dev.install jq-1.5+dfsg/debian/libjq-dev.install --- jq-1.5+dfsg/debian/libjq-dev.install 2016-11-26 20:50:06.000000000 -0500 +++ jq-1.5+dfsg/debian/libjq-dev.install 2016-12-27 19:00:48.000000000 -0500 @@ -1,3 +1,3 @@ -usr/include/*.h -usr/lib/*/lib*.a -usr/lib/*/lib*.so +usr/include/jq.h +usr/include/jv.h +usr/lib/*/libjq.so diff -Nru jq-1.5+dfsg/debian/patches/disable-static-libtool.patch jq-1.5+dfsg/debian/patches/disable-static-libtool.patch --- jq-1.5+dfsg/debian/patches/disable-static-libtool.patch 1969-12-31 19:00:00.000000000 -0500 +++ jq-1.5+dfsg/debian/patches/disable-static-libtool.patch 2016-12-27 19:04:39.000000000 -0500 @@ -0,0 +1,65 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,7 @@ + $(AM_V_LEX) flex -o lexer.c --header-file=lexer.h $< + lexer.h: lexer.c + else +-BUILT_SOURCES = ++BUILT_SOURCES = + .y.c: + $(AM_V_YACC) echo "NOT building parser.c!" + .l.c: +@@ -84,11 +84,10 @@ + + bin_PROGRAMS = jq + jq_SOURCES = main.c version.h +-jq_LDFLAGS = -static-libtool-libs + jq_LDADD = libjq.la -lm + + if ENABLE_ALL_STATIC +-jq_LDFLAGS += -all-static ++jq_LDFLAGS = -all-static + endif + + ### Tests (make check) +@@ -147,7 +146,7 @@ + docs/default_manpage.md jq.1.default + + # setup is only used by distribution developers, not package developers. +-# Still, as a matter of allowing patching, its not a bad idea to distribute ++# Still, as a matter of allowing patching, its not a bad idea to distribute + # the developer setup script in the tarball. + EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) jq.spec \ + $(DOC_FILES) scripts/version parser.h parser.c lexer.h \ +@@ -165,7 +164,7 @@ + jq.1.prebuilt + + +-# README.md is expected in Github projects, good stuff in it, so we'll ++# README.md is expected in Github projects, good stuff in it, so we'll + # distribute it and install it with the package in the doc directory. + docdir = ${datadir}/doc/${PACKAGE} + dist_doc_DATA = AUTHORS README +@@ -188,7 +187,7 @@ + clean-local-docs: + if ENABLE_DOCS + rm -f jq.1 +-endif ++endif + + clean-local-gcov: + rm -f *.gcno *.gcda *.gcov +--- a/tests/setup ++++ b/tests/setup +@@ -9,8 +9,9 @@ + JQ=$JQBASEDIR/jq + + if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then +- VALGRIND="valgrind --error-exitcode=1 --leak-check=full \ +- --suppressions=$JQTESTDIR/onig.supp" ++ VALGRIND="libtool --mode=execute -- valgrind \ ++ --error-exitcode=1 --leak-check=full \ ++ --suppressions=$JQTESTDIR/onig.supp" + Q=-q + else + VALGRIND= diff -Nru jq-1.5+dfsg/debian/patches/dont-distribute-duplicate-docs.patch jq-1.5+dfsg/debian/patches/dont-distribute-duplicate-docs.patch --- jq-1.5+dfsg/debian/patches/dont-distribute-duplicate-docs.patch 2016-11-13 19:39:17.000000000 -0500 +++ jq-1.5+dfsg/debian/patches/dont-distribute-duplicate-docs.patch 2016-12-27 19:04:39.000000000 -0500 @@ -4,11 +4,9 @@ Last-Update: 2015-10-11 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: jq/Makefile.am -=================================================================== ---- jq.orig/Makefile.am 2015-10-11 21:34:06.763923643 +0200 -+++ jq/Makefile.am 2015-10-11 21:34:22.375923193 +0200 -@@ -169,7 +169,7 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -168,7 +168,7 @@ # README.md is expected in Github projects, good stuff in it, so we'll # distribute it and install it with the package in the doc directory. docdir = ${datadir}/doc/${PACKAGE} diff -Nru jq-1.5+dfsg/debian/patches/series jq-1.5+dfsg/debian/patches/series --- jq-1.5+dfsg/debian/patches/series 2016-11-13 19:44:16.000000000 -0500 +++ jq-1.5+dfsg/debian/patches/series 2016-12-27 19:04:39.000000000 -0500 @@ -1,7 +1,7 @@ enable-manpages.patch remove-unecessary-rakefile-deps.patch patch-version-into-build.patch -static-libjq-dynamic-libonig2.patch dont-distribute-duplicate-docs.patch stack-exhaustion.patch heap-buffer-overflow.patch +disable-static-libtool.patch diff -Nru jq-1.5+dfsg/debian/patches/static-libjq-dynamic-libonig2.patch jq-1.5+dfsg/debian/patches/static-libjq-dynamic-libonig2.patch --- jq-1.5+dfsg/debian/patches/static-libjq-dynamic-libonig2.patch 2016-11-13 19:27:52.000000000 -0500 +++ jq-1.5+dfsg/debian/patches/static-libjq-dynamic-libonig2.patch 1969-12-31 19:00:00.000000000 -0500 @@ -1,63 +0,0 @@ -Description: The original Makefile either links everything dynamically or - statically. This patch modifies the Makefile to link libjq statically and - libonig2 dynamically. -Author: Simon Elsbrock -Forwarded: not-needed -Last-Update: 2015-10-11 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: jq/Makefile.am -=================================================================== ---- jq.orig/Makefile.am 2015-10-11 03:50:10.822586743 +0200 -+++ jq/Makefile.am 2015-10-11 12:08:38.703822442 +0200 -@@ -40,12 +40,12 @@ - - ### libjq - --lib_LTLIBRARIES = libjq.la --libjq_la_SOURCES = ${LIBJQ_SRC} --libjq_la_LIBADD = -lm --libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0 -+#lib_LTLIBRARIES = libjq.la -+#libjq_la_SOURCES = ${LIBJQ_SRC} -+#libjq_la_LIBADD = -lm -+#libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0 - --include_HEADERS = jv.h jq.h -+#include_HEADERS = jv.h jq.h - - ### Running tests under Valgrind - -@@ -64,8 +64,8 @@ - ### Error injection for testing - - if ENABLE_ERROR_INJECTION --lib_LTLIBRARIES += libinject_errors.la --libinject_errors_la_SOURCES = inject_errors.c -+lib_LTLIBRARIES = libinject_errors.la -+libinject_errors_la_SOURCES = inject_errors.c ${LIBJQ_SRC} - libinject_errors_la_LIBADD = -ldl - libinject_errors_la_LDFLAGS = -module - endif -@@ -83,13 +83,14 @@ - main.c: version.h - - bin_PROGRAMS = jq --jq_SOURCES = main.c version.h --jq_LDFLAGS = -static-libtool-libs --jq_LDADD = libjq.la -lm -- --if ENABLE_ALL_STATIC --jq_LDFLAGS += -all-static --endif -+jq_SOURCES = main.c version.h ${LIBJQ_SRC} -+#jq_LDFLAGS = -static-libtool-libs -+jq_CFLAGS = $(AM_CFLAGS) -+jq_LDADD = -lm -lonig -+ -+#if ENABLE_ALL_STATIC -+#jq_LDFLAGS += -all-static -+#endif - - ### Tests (make check) - diff -Nru jq-1.5+dfsg/debian/rules jq-1.5+dfsg/debian/rules --- jq-1.5+dfsg/debian/rules 2016-11-19 20:49:36.000000000 -0500 +++ jq-1.5+dfsg/debian/rules 2016-12-27 19:00:48.000000000 -0500 @@ -15,7 +15,7 @@ override_dh_auto_configure: cp jq.1 jq.1.old cd docs && rake manpage > ../jq.1 - dh_auto_configure + dh_auto_configure -- --disable-static override_dh_auto_test: VERBOSE=1 dh_auto_test @@ -25,7 +25,7 @@ test ! -f ./jq.1.old || mv ./jq.1.old jq.1 override_dh_install: - dh_install --fail-missing + dh_install --list-missing %: dh $@ --with autoreconf
