diff -Nru libnxml-0.18.3/debian/changelog libnxml-0.18.3/debian/changelog --- libnxml-0.18.3/debian/changelog 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/changelog 2019-01-21 00:00:14.000000000 +0000 @@ -1,3 +1,29 @@ +libnxml (0.18.3-7) unstable; urgency=medium + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + * d/control: Deprecating priority extra as per policy 4.0.1 + * d/changelog: Remove trailing whitespaces + + [ Joseph Herlant ] + * d/control: + * Set Vcs-* to salsa.debian.org. + * upgrade standards to 4.3.0. + * Use the new debhelper-compat(=12) notation and drop d/compat. + * Update my email to my new debian.org one. + * d/watch: repo has moved to github. + * Remove unnecessary dependency on autoreconf. + * Switch to automatic -dbgsym. + * d/rules: + * should be executable. + * d/rules: set hardening to all. + * Add Build-Depends-Package to the symbols file. + * Add an upstream/metadata file. + * Run the examples in autopkgtests. + * Add patch to avoid unnecessary failures in autopkgtest. + + -- Joseph Herlant Sun, 20 Jan 2019 16:00:14 -0800 + libnxml (0.18.3-6) unstable; urgency=medium * Updating description for multiarchify_pc_file.patch @@ -46,9 +72,9 @@ * Non-maintainer upload. * debian/control: - - changed debug's binary package to its + - changed debug's binary package to its proper archive section. Hopefully dak will - be happy again. + be happy again. -- Andrea Veri Tue, 16 Aug 2011 17:40:10 +0200 diff -Nru libnxml-0.18.3/debian/compat libnxml-0.18.3/debian/compat --- libnxml-0.18.3/debian/compat 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru libnxml-0.18.3/debian/control libnxml-0.18.3/debian/control --- libnxml-0.18.3/debian/control 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/control 2019-01-20 23:57:00.000000000 +0000 @@ -1,12 +1,12 @@ Source: libnxml Section: libs Priority: optional -Maintainer: Joseph Herlant -Build-Depends: dctrl-tools, debhelper (>= 9), dh-autoreconf, libcurl4-gnutls-dev -Standards-Version: 3.9.5 +Maintainer: Joseph Herlant +Build-Depends: dctrl-tools, debhelper-compat (= 12), libcurl4-gnutls-dev +Standards-Version: 4.3.0 Homepage: http://www.autistici.org/bakunin/libnxml/doc/index.html -Vcs-Browser: http://anonscm.debian.org/git/collab-maint/libnxml.git -Vcs-Git: git://anonscm.debian.org/collab-maint/libnxml.git +Vcs-Browser: https://salsa.debian.org/debian/libnxml +Vcs-Git: https://salsa.debian.org/debian/libnxml.git Package: libnxml0-dev Multi-Arch: same @@ -34,16 +34,3 @@ (1234, 4321, 2143, 2312). . This package contains the shared libraries. - -Package: libnxml0-dbg -Section: debug -Priority: extra -Multi-Arch: same -Architecture: any -Depends: libnxml0 (= ${binary:Version}), ${misc:Depends} -Description: shared libraries with debugging symbols for libnxml0 - libnxml is a C library for parsing, writing, and creating XML 1.0 and - 1.1 files or streams. It supports UTF-8, UTF-16be and UTF-16le, UCS-4 - (1234, 4321, 2143, 2312). - . - This package contains the shared libraries with debugging symbols. diff -Nru libnxml-0.18.3/debian/copyright libnxml-0.18.3/debian/copyright --- libnxml-0.18.3/debian/copyright 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/copyright 2019-01-20 23:42:24.000000000 +0000 @@ -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/ Upstream-Name: libnxml Source: http://www.autistici.org/bakunin/libnxml/ diff -Nru libnxml-0.18.3/debian/libnxml0.symbols libnxml-0.18.3/debian/libnxml0.symbols --- libnxml-0.18.3/debian/libnxml0.symbols 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/libnxml0.symbols 2019-01-21 00:00:14.000000000 +0000 @@ -1,4 +1,5 @@ libnxml.so.0 libnxml0 #MINVER# +* Build-Depends-Package: libnxml0-dev __nxml_atoi@Base 0.18.3 __nxml_escape_spaces@Base 0.18.3 __nxml_get_value@Base 0.18.3 diff -Nru libnxml-0.18.3/debian/patches/incorrect_stderr_output.patch libnxml-0.18.3/debian/patches/incorrect_stderr_output.patch --- libnxml-0.18.3/debian/patches/incorrect_stderr_output.patch 1970-01-01 00:00:00.000000000 +0000 +++ libnxml-0.18.3/debian/patches/incorrect_stderr_output.patch 2019-01-21 00:00:14.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fixing incorrect usage of stderr in test/new.c + This patch is fixing an incorrect redirect to stderr that makes autopkgtest + fail for no good reason. +Author: Joseph Herlant +Forwarded: https://github.com/bakulf/libnxml/pull/4 +Last-Update: 2019-01-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/test/new.c ++++ b/test/new.c +@@ -61,7 +61,7 @@ + for (j = 0; j < 10; j++) + { + attr = NULL; +- fprintf (stderr, "Creatin a attribute... "); ++ fprintf (stdout, "Creatin a attribute... "); + ret = nxml_add_attribute (data, item, &attr); + check (data, ret); + diff -Nru libnxml-0.18.3/debian/patches/nxml_parser.diff libnxml-0.18.3/debian/patches/nxml_parser.diff --- libnxml-0.18.3/debian/patches/nxml_parser.diff 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/patches/nxml_parser.diff 2019-01-20 23:52:25.000000000 +0000 @@ -1,9 +1,8 @@ Description: patch to not strip leading spaces out of feeds (Closes: #496765) Author: Varun Hiremath -diff -urN libnxml-0.18.3.orig/src/nxml_parser.c libnxml-0.18.3/src/nxml_parser.c ---- libnxml-0.18.3.orig/src/nxml_parser.c 2008-09-09 22:51:22.000000000 -0400 -+++ libnxml-0.18.3/src/nxml_parser.c 2008-09-09 22:51:35.000000000 -0400 +--- a/src/nxml_parser.c ++++ b/src/nxml_parser.c @@ -57,7 +57,7 @@ if (*(buffer + i) == 0xd) continue; diff -Nru libnxml-0.18.3/debian/patches/README.diff libnxml-0.18.3/debian/patches/README.diff --- libnxml-0.18.3/debian/patches/README.diff 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/patches/README.diff 2019-01-20 23:52:25.000000000 +0000 @@ -1,10 +1,8 @@ Description: Include test/* files as examples in libnxml0-dev package. Author: Varun Hiremath -Index: libnxml-0.18.1/README -=================================================================== ---- libnxml-0.18.1.orig/README 2007-10-22 23:38:55.000000000 +0530 -+++ libnxml-0.18.1/README 2007-10-22 23:39:02.000000000 +0530 +--- a/README ++++ b/README @@ -2,4 +2,4 @@ streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312). diff -Nru libnxml-0.18.3/debian/patches/series libnxml-0.18.3/debian/patches/series --- libnxml-0.18.3/debian/patches/series 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/patches/series 2019-01-21 00:00:14.000000000 +0000 @@ -1,3 +1,4 @@ +incorrect_stderr_output.patch README.diff nxml_parser.diff multiarchify_pc_file.patch diff -Nru libnxml-0.18.3/debian/rules libnxml-0.18.3/debian/rules --- libnxml-0.18.3/debian/rules 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/rules 2019-01-21 00:00:14.000000000 +0000 @@ -2,18 +2,10 @@ # # export DH_VERBOSE=1 -# Redefining the upstream version number that were provided by cdbs -DEB_UPSTREAM_VERSION ?= $(shell dpkg-parsechangelog \ - | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p') +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autoreconf - -override_dh_strip: - dh_strip --dbg-package=libnxml0-dbg + dh $@ override_dh_compress: dh_compress -X.c - -override_dh_makeshlibs: - dh_makeshlibs -V "libnxml0, libnxml-abi-$(DEB_UPSTREAM_VERSION)" diff -Nru libnxml-0.18.3/debian/tests/control libnxml-0.18.3/debian/tests/control --- libnxml-0.18.3/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ libnxml-0.18.3/debian/tests/control 2019-01-21 00:00:14.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: run-examples +Depends: @, build-essential diff -Nru libnxml-0.18.3/debian/tests/run-examples libnxml-0.18.3/debian/tests/run-examples --- libnxml-0.18.3/debian/tests/run-examples 1970-01-01 00:00:00.000000000 +0000 +++ libnxml-0.18.3/debian/tests/run-examples 2019-01-21 00:00:14.000000000 +0000 @@ -0,0 +1,43 @@ +#!/bin/sh +# Make sure that the examples compile and run + +cd $AUTOPKGTEST_TMP + +set -e + +EXAMPLES_DIR=/usr/share/doc/libnxml0-dev/examples + +for f in easy new ; do + gcc -lnxml ${EXAMPLES_DIR}/${f}.c -o $f && ./${f} + rm ${f} +done + +# File used in xml examples +echo "bc1c2" > example.xml + +# namespace and parser +for f in namespace parser ; do + gcc -lnxml ${EXAMPLES_DIR}/${f}.c -o $f && ./${f} example.xml + rm ${f} +done + +# write +gcc -lnxml ${EXAMPLES_DIR}/write.c -o write +./write example.xml write_output.xml +rm write + +# Double-checking that the output of write is the expected one +cat > write_output_ref.xml << __EOF__ + + + + b + + c1 + c2 + + +__EOF__ +diff write_output.xml write_output_ref.xml + +rm example.xml write_output.xml write_output_ref.xml diff -Nru libnxml-0.18.3/debian/upstream/metadata libnxml-0.18.3/debian/upstream/metadata --- libnxml-0.18.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libnxml-0.18.3/debian/upstream/metadata 2019-01-21 00:00:14.000000000 +0000 @@ -0,0 +1,7 @@ +--- +Bug-Submit: https://github.com/bakulf/libnxml/issues +Changelog: https://github.com/bakulf/libnxml/blob/master/ChangeLog +Documentation: https://github.com/bakulf/libnxml +Name: libnxml +Repository: git@github.com:bakulf/libnxml.git +Repository-Browse: https://github.com/bakulf/libnxml diff -Nru libnxml-0.18.3/debian/watch libnxml-0.18.3/debian/watch --- libnxml-0.18.3/debian/watch 2014-03-23 13:21:12.000000000 +0000 +++ libnxml-0.18.3/debian/watch 2019-01-20 23:42:24.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -http://www2.autistici.org/bakunin/codes.php .*/libnxml-(.*)\.tar\.gz debian debian/orig-tar.sh +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libnxml-$1\.tar\.gz/ \ +https://github.com/bakulf/libnxml/tags .*/v?(\d\S*)\.tar\.gz