Control: tags 948791 + patch Control: tags 948791 + pending Control: tags 949513 + patch Control: tags 949513 + pending
Dear maintainer,
I'm sponsoring the above NMU for xmlstarlet (versioned as 1.6.1-2.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
More about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for xmlstarlet-1.6.1 xmlstarlet-1.6.1 changelog | 77 +++++++++++++++++++++------------- compat | 1 control | 17 +++++-- copyright | 2 patches/pkg-config.patch | 105 +++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 rules | 7 ++- 7 files changed, 174 insertions(+), 36 deletions(-) diff -Nru xmlstarlet-1.6.1/debian/changelog xmlstarlet-1.6.1/debian/changelog --- xmlstarlet-1.6.1/debian/changelog 2017-01-24 13:14:14.000000000 +0100 +++ xmlstarlet-1.6.1/debian/changelog 2020-05-30 15:34:58.000000000 +0200 @@ -1,3 +1,25 @@ +xmlstarlet (1.6.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use pkg-config to find the libxml2, libxslt and libexslt libraries + (Closes: #948791, #949513). + * debian/changelog: Remove trailing whitespace. + * debian/control: + - Sort Build-Depends list. + - Drop build-dependencies on autotools-dev and dh-autoreconf. + The autoreconf sequence is enabled by default in debhelper >= 10. + - Build-Depend on pkg-config. + - Use debhelper-compat v13 instead of legacy debian/compat. + - Raise Standards-Version to 4.5.0 from 3.9.8 (no changes needed). + - Add Rules-Requires-Root: no. + * debian/copyright: Use secure HTTP protocol in the Format field. + * debian/rules: + - Drop '--with autoreconf' with change to debhelper >= 10. + - Set 0644 permissions on xmlstarlet-pad.xml and xmlstarlet-xsa.xml. + - Do not install upstream ChangeLog. The file is empty. + + -- Hugh McMaster <[email protected]> Sat, 30 May 2020 23:34:58 +1000 + xmlstarlet (1.6.1-2) unstable; urgency=medium * Bump to Standards-Version 3.9.8. No changes required. @@ -54,7 +76,7 @@ * Remove patch 10-add-xmlstar-fodoc-style.xsl.patch: it is not needed any more, xmlstar-fodoc-style.xsl is now included in upstream tarball. * Remove patch 20-automake-needs-pkg-tarname.patch: fixed in new release. - * debian/rules: exclude test log files generated during build time from + * debian/rules: exclude test log files generated during build time from examples directory. -- Mònica Ramírez Arceda <[email protected]> Mon, 11 Feb 2013 17:08:46 +0100 @@ -65,18 +87,18 @@ * Remove patch fix_inconsistency_man_page.patch: it's not needed anymore. * debian/docs: remove doc/callouts. This dir doesn't exist anymore. * Generate documentation. (Closes: #621755) - - debian/rules: add --enable-build-docs option to configure to generate + - debian/rules: add --enable-build-docs option to configure to generate documentation. - - debian/clean: remove upstream documentation to generate documentation + - debian/clean: remove upstream documentation to generate documentation again. - - debian/patches/10-add-xmlstar-fodoc-style.xsl.patch: add + - debian/patches/10-add-xmlstar-fodoc-style.xsl.patch: add xmlstar-fodoc-style.xsl to be able to generate documentation. - * debian/patches/20-automake-needs-pkg-tarname.patch: Install + * debian/patches/20-automake-needs-pkg-tarname.patch: Install documentation in /usr/share/doc/xmlstarlet, instead of /usr/share/doc/. * Update debian/xmlstarlet.doc-base. - * Add xsltproc, gawk, docbook-xsl-ns, fop and ghostscript as build + * Add xsltproc, gawk, docbook-xsl-ns, fop and ghostscript as build dependencies. - * debian/patches/30-fix-stray-in-program.patch: Force usage2c.awk to use + * debian/patches/30-fix-stray-in-program.patch: Force usage2c.awk to use gawk. * debian/patches/40-use-debian-docbook-xsl.patch: use docbook stylesheets from docbook-xsl-ns package. @@ -86,7 +108,7 @@ xmlstarlet (1.3.1-3) unstable; urgency=low - * Remove debian/menu file: xmlstarlet does not do anything useful if invoked + * Remove debian/menu file: xmlstarlet does not do anything useful if invoked without arguments. (Closes: #673716) -- Mònica Ramírez Arceda <[email protected]> Sat, 23 Jun 2012 17:58:15 +0200 @@ -111,7 +133,7 @@ xmlstarlet (1.3.0-1) unstable; urgency=low * New upstream release. - - Work around libxml bug that passes bogus data + - Work around libxml bug that passes bogus data to error handler (Closes: #642523) -- Mònica Ramírez Arceda <[email protected]> Thu, 06 Oct 2011 11:22:27 +0200 @@ -126,7 +148,7 @@ xmlstarlet (1.2.0-1) unstable; urgency=low * New upstream release. - - Restore input context (lost in version 1.0.3) to error messages. + - Restore input context (lost in version 1.0.3) to error messages. (Closes: #627158) * Bump to Standards-Version 3.9.2. No changes required. * fix_inconsistency_man_page.patch: update patch header to fix minor spelling. @@ -137,14 +159,14 @@ * New upstream release. * Remove add.shellscript.mark.patch: fixed in upstream. - * Remove --disable-static-libs configure option in debian/rules: + * Remove --disable-static-libs configure option in debian/rules: static libs are disabled in upstream by default. * Change the way of renaming xml to xmlstarlet in debian/rules. Thanks to Vincent Lefevre. (See bug #621755). - * Fix inconsistency of names (rename xml to xmlstarlet) in man page + * Fix inconsistency of names (rename xml to xmlstarlet) in man page (fix_inconsistency_man_page.patch). (See bug #621755). * Update debian/control: add automake version dependency to avoid build errors - with older versions. + with older versions. See: https://buildd.debian.org/status/fetch.php?pkg=xmlstarlet&arch=hurd-i386&ver=1.0.6-1&stamp=1300571888 * Update debian/copyright to DEP-5. @@ -154,7 +176,7 @@ * New upstream release. * Update add.shellscript.mark.patch to add examples/c14n-newlines. - * debian/rules: Remove override_dh_auto_build. + * debian/rules: Remove override_dh_auto_build. After applying clean target, version.h is regenerated. -- Mònica Ramírez Arceda <[email protected]> Thu, 17 Mar 2011 12:38:02 +0100 @@ -162,15 +184,15 @@ xmlstarlet (1.0.5-1) unstable; urgency=low * New upstream release. - - Use XSLT_PARSE_OPTIONS, else CDATA nodes can cause corruption. + - Use XSLT_PARSE_OPTIONS, else CDATA nodes can cause corruption. (Closes: #583113) - * Remove upstream.version.without.git.patch: new release realizes if + * Remove upstream.version.without.git.patch: new release realizes if we are using a git repository or not. * Remove fix.spelling.errors.patch: spelling error solved in new upstream release. - * Remove fix.wrong.documentation.patch: in new upstream release + * Remove fix.wrong.documentation.patch: in new upstream release usage strings use argv[0] as program name. - * debian/rules: Make sure version.h exists. After applying clean target, + * debian/rules: Make sure version.h exists. After applying clean target, version.h is removed and the next builds fail. * Add Vcs-Git, Vcs-Browser fields in debian/control. @@ -188,22 +210,22 @@ xmlstarlet (1.0.3-1) unstable; urgency=low - * Adopt the package. (Closes: #571643) - * New upstream release. - * Update debhelper compatibility level to 8. No changes required further + * Adopt the package. (Closes: #571643) + * New upstream release. + * Update debhelper compatibility level to 8. No changes required further changing version in debian/compat and debian/control files. * Change debian/rules to use dh command. * Bump to Standards-Version 3.9.1. No changes required. * Add Debian menu entry. * Update watch file to version 3. * Patch configure.ac to build the package with shared libixml2 and libxslt. - This patch is based in an upstream commit. - See commit number 7e46365a274e1c0e5276423391a46e65b76336e9 + This patch is based in an upstream commit. + See commit number 7e46365a274e1c0e5276423391a46e65b76336e9 in upstream repository: http://xmlstar.git.sourceforge.net/ Hopefully, it will be included in next version. - * Patch configure.ac version to avoid getting version from git repository. + * Patch configure.ac version to avoid getting version from git repository. * configure.in file disappeared and therefore the Debian patch applied to it. - * Delete pkg-config dependency: + * Delete pkg-config dependency: pkg-config was used in the patch of old configure.in. * Fix wrong documentation in --help options. Patch fix.wrong.documentation. (Closes: #373167) @@ -219,7 +241,7 @@ * QA upload. * New upstream release. Includes prevention of -N - options getting dropped for command-line + options getting dropped for command-line (Closes: #540842) (LP: #209982) * Migrate to 3.0 (quilt) for upstream changes. * Build-depend on autotools-dev and dh-autoreconf to update the @@ -275,7 +297,7 @@ xmlstarlet (0.9.3-2) unstable; urgency=low - * Fixed debian/watch so uscan can find new versions of xmlstarlet + * Fixed debian/watch so uscan can find new versions of xmlstarlet -- Alex Mauer <[email protected]> Tue, 12 Oct 2004 15:40:14 -0500 @@ -285,4 +307,3 @@ * First package for me! -- Alex Mauer <[email protected]> Tue, 28 Sep 2004 17:10:28 -0500 - diff -Nru xmlstarlet-1.6.1/debian/compat xmlstarlet-1.6.1/debian/compat --- xmlstarlet-1.6.1/debian/compat 2013-07-14 14:17:25.000000000 +0200 +++ xmlstarlet-1.6.1/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -9 diff -Nru xmlstarlet-1.6.1/debian/control xmlstarlet-1.6.1/debian/control --- xmlstarlet-1.6.1/debian/control 2017-01-23 17:34:58.000000000 +0100 +++ xmlstarlet-1.6.1/debian/control 2020-05-30 15:34:58.000000000 +0200 @@ -2,10 +2,19 @@ Section: text Priority: optional Maintainer: Mònica Ramírez Arceda <[email protected]> -Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, - libxml2-dev, libxslt1-dev (>=1.1.9), automake (>=1.11), xsltproc, - gawk, docbook-xsl-ns, fop, ghostscript -Standards-Version: 3.9.8 +Build-Depends: + debhelper-compat (= 13), + automake (>=1.11), + docbook-xsl-ns, + fop, + gawk, + ghostscript, + libxml2-dev, + libxslt1-dev (>=1.1.9), + pkg-config, + xsltproc +Standards-Version: 4.5.0 +Rules-Requires-Root: no Homepage: http://xmlstar.sourceforge.net/ Vcs-Git: https://anonscm.debian.org/git/collab-maint/xmlstarlet.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xmlstarlet.git diff -Nru xmlstarlet-1.6.1/debian/copyright xmlstarlet-1.6.1/debian/copyright --- xmlstarlet-1.6.1/debian/copyright 2013-07-14 14:17:25.000000000 +0200 +++ xmlstarlet-1.6.1/debian/copyright 2020-05-30 15:34:58.000000000 +0200 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstrem-Name: XMLStarlet Command Line XML Toolkit Upstream-Contact: Mikhail Grushinskiy <[email protected]> Dagobert Michelsen <[email protected]> diff -Nru xmlstarlet-1.6.1/debian/patches/pkg-config.patch xmlstarlet-1.6.1/debian/patches/pkg-config.patch --- xmlstarlet-1.6.1/debian/patches/pkg-config.patch 1970-01-01 01:00:00.000000000 +0100 +++ xmlstarlet-1.6.1/debian/patches/pkg-config.patch 2020-05-30 15:34:58.000000000 +0200 @@ -0,0 +1,105 @@ +Description: Use PKG_CHECK_MODULES to detect libxml2, libxslt and libexslt. + Also remove the STATIC_LIBS build option, since Debian doesn't ship static + libraries for libxslt or libexslt. +Author: Hugh McMaster <[email protected]> +Bug-Debian: https://bugs.debian.org/948791 +Bug-Debian: https://bugs.debian.org/949513 +Forwarded: no +Last-Update: 2020-05-31 + +--- a/configure.ac ++++ b/configure.ac +@@ -11,16 +11,6 @@ + [LIBXML_REQUIRED_VERSION=2.6.27] + [LIBXSLT_REQUIRED_VERSION=1.1.9] + +-XSTAR_LIB_ARGS_WITH([LIBXML], [with-src]) +-XSTAR_LIB_ARGS_WITH([LIBXSLT], [with-src]) +-XSTAR_LIB_ARGS_WITH([LIBICONV]) +- +-AC_ARG_ENABLE([static-libs], +- [AS_HELP_STRING([--enable-static-libs], +- [link statically with libxml2 and lib(e)xslt @<:@default=no@:>@])], +- [STATIC_LIBS=$enableval], +- [STATIC_LIBS=no]) +- + AS_IF([test -r doc/xmlstarlet.1], [LACK_DOCS=no], [LACK_DOCS=yes]) + + AC_ARG_ENABLE([build_docs], +@@ -42,33 +32,14 @@ + AC_ARG_PROGRAM dnl Transforming Program Names When Installing + AC_PROG_SED + AC_PROG_AWK ++PKG_PROG_PKG_CONFIG + +-XSTAR_LIB_CHECK([LIBXML], [xml2-config]) ++PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) ++PKG_CHECK_EXISTS([libexslt], ++ [PKG_CHECK_MODULES([LIBXSLT], [libexslt])], ++ [PKG_CHECK_MODULES([LIBXSLT], [libxslt >= $LIBXSLT_REQUIRED_VERSION])]) + +-AS_IF([test "x$LIBXML_SRCDIR" != x], +- [LIBXML_INCDIR="$LIBXML_SRCDIR/include"]) +-[: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}] +- +-AS_IF([test "x$STATIC_LIBS" != xno], +- [LIBXML_CPPFLAGS="-I$LIBXML_INCDIR -DLIBXML_STATIC"], +- [LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"]) +- +-AS_IF([test "x$STATIC_LIBS" != xno], +- [LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"], +- [LIBXML_LIBS="-lxml2"]) +- +- +-XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) +- +-AS_IF([test "x$LIBXSLT_SRCDIR" != x], +- [XSLTPROC_PATH="$LIBXSLT_SRCDIR/xsltproc:$PATH" +- LIBXSLT_INCDIR="$LIBXSLT_SRCDIR" +- LIBXSLT_LDFLAGS="-L$LIBXSLT_SRCDIR/libexslt/.libs -L$LIBXSLT_SRCDIR/libxslt/.libs" +- AS_IF([test "x$STATIC_LIBS" != xno], +- [LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"])], +- [XSLTPROC_PATH="$PATH" +- AS_IF([test "x$STATIC_LIBS" != xno], +- [LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"])]) ++XSLTPROC_PATH="$PATH" + + AS_IF([test x"$enable_build_docs" = xyes], + [AC_PATH_PROG(XSLTPROC, xsltproc, [none], [$XSLTPROC_PATH]) +@@ -87,13 +58,8 @@ + + AM_CONDITIONAL([BUILD_DOCS], [test x"$enable_build_docs" = xyes]) + +- +-AS_IF([test "x$STATIC_LIBS" = xno], +- [LIBXSLT_LIBS="-lexslt -lxslt"]) +- +-[: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}] +-[LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"] +- ++[LIBXML_CPPFLAGS="$LIBXML_CFLAGS"] ++[LIBXSLT_CPPFLAGS="$LIBXSLT_CFLAGS"] + + [WIN32_EXTRA_LDFLAGS=] + [WIN32_EXTRA_LIBS=] +@@ -116,20 +82,6 @@ + # replace the libraries from ./configure + [USER_LIBS="$LIBS"] + [LIBS=] +-# shared libraries link to dependant libraries automatically +-AS_IF([test "x$STATIC_LIBS" != xno], +- [AC_SEARCH_LIBS([dlopen], [dl], [], [], "$USER_LIBS") +- AC_SEARCH_LIBS([sqrt], [m], [], [], "$USER_LIBS") +- AC_SEARCH_LIBS([iconv_open], [iconv], [], +- [AC_SEARCH_LIBS([libiconv_open], [iconv], [], [], "$USER_LIBS")], "$USER_LIBS") +- AC_SEARCH_LIBS([clock_gettime], [rt], [], [], "$USER_LIBS") +- AC_SEARCH_LIBS([deflate], [z], [], [], "$USER_LIBS") +- AC_SEARCH_LIBS([gcry_cipher_encrypt], [gcrypt], [], [], "$USER_LIBS") +- +- # Checks for inet libraries: +- AC_SEARCH_LIBS([gethostent], [nsl], [], [], "$USER_LIBS") +- AC_SEARCH_LIBS([setsockopt], [socket net network], [], [], "$USER_LIBS") +- AC_SEARCH_LIBS([connect], [inet], [], [], "$USER_LIBS")]) + + AC_CHECK_FUNCS_ONCE([lstat stat]) + diff -Nru xmlstarlet-1.6.1/debian/patches/series xmlstarlet-1.6.1/debian/patches/series --- xmlstarlet-1.6.1/debian/patches/series 2017-01-24 12:33:46.000000000 +0100 +++ xmlstarlet-1.6.1/debian/patches/series 2020-05-30 15:34:58.000000000 +0200 @@ -4,3 +4,4 @@ 70-remove-link-usr-lib.patch 80-fix-unesc-dquot.patch 90-fix-upstream-version.patch +pkg-config.patch diff -Nru xmlstarlet-1.6.1/debian/rules xmlstarlet-1.6.1/debian/rules --- xmlstarlet-1.6.1/debian/rules 2017-01-24 12:39:55.000000000 +0100 +++ xmlstarlet-1.6.1/debian/rules 2020-05-30 15:34:58.000000000 +0200 @@ -9,7 +9,7 @@ export DEB_VERSION_UPSTREAM %: - dh $@ --with autoreconf + dh $@ # Rename the binary xml -> xmlstarlet override_dh_auto_configure: @@ -17,7 +17,10 @@ override_dh_fixperms: dh_fixperms - chmod 644 $(CURDIR)/debian/xmlstarlet/usr/share/doc/xmlstarlet/examples/xml/xmlstarlet-xsa.xml + chmod 644 $(CURDIR)/debian/xmlstarlet/usr/share/doc/xmlstarlet/examples/xml/xmlstarlet*.xml + +override_dh_installchangelogs: + dh_installchangelogs -XChangeLog override_dh_installexamples: dh_installexamples --exclude=log --exclude=trs examples/*
signature.asc
Description: PGP signature
