Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: pu Tags: stretch
Hello, I am dealing with the package "xml2" to fix its RC bugs. A previous QA upload into Unstable was uploaded and migrated into Testing. Now I want to do some stable uploads and fix this bug inside Stretch. For previous QA upload, see https://bugs.debian.org/876286 . All fixes are taken from upstream's release tarball of next version. Debdiff attached: diff -u xml2-0.4/debian/control xml2-0.4/debian/control --- xml2-0.4/debian/control +++ xml2-0.4/debian/control @@ -1,7 +1,7 @@ Source: xml2 Section: utils Priority: optional -Maintainer: Patrick Schoenfeld <schoenf...@debian.org> +Maintainer: Debian QA Group <packa...@qa.debian.org> Homepage: http://ofb.net/~egnor/xml2/ Vcs-Git: git://git.debian.org/git/collab-maint/xml2.git Vcs-Browser: http://git.debian.org/?p=collab-maint/xml2.git diff -u xml2-0.4/debian/changelog xml2-0.4/debian/changelog --- xml2-0.4/debian/changelog +++ xml2-0.4/debian/changelog @@ -1,3 +1,14 @@ +xml2 (0.4-3.1+deb9u1) stretch; urgency=medium + + * QA upload. + * Set maintainer to Debian QA Group. + * Backport patch to fix corruption when dealing with UTF-8 files. + (Closes: #506805; Closes: #698072) + * Backport patch to fix usage string for 2csv tool. + (Closes: #506788) + + -- Boyuan Yang <073p...@gmail.com> Sun, 01 Oct 2017 23:30:42 +0800 + xml2 (0.4-3.1) unstable; urgency=low * Non-maintainer upload. diff -u xml2-0.4/debian/patches/series xml2-0.4/debian/patches/series --- xml2-0.4/debian/patches/series +++ xml2-0.4/debian/patches/series @@ -2,0 +3,2 @@ +0003-Fix-corrupted-handling-with-UTF-8-text.patch +0004-Fix-help-msg-of-2csv-tool.patch only in patch2: unchanged: --- xml2-0.4.orig/debian/patches/0003-Fix-corrupted-handling-with-UTF-8- text.patch +++ xml2-0.4/debian/patches/0003-Fix-corrupted-handling-with-UTF-8-text.patch @@ -0,0 +1,22 @@ +From: Vincent Lefevre <vinc...@vinc17.net> +Date: Sun, 1 Oct 2017 23:27:14 +0800 +Subject: Fix corrupted handling with UTF-8 text + +--- + xml2.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xml2.c b/xml2.c +index fc94d69..d786021 100644 +--- a/xml2.c ++++ b/xml2.c +@@ -247,8 +247,7 @@ int main(int argc,char *argv[]) + init(&sax); + + if (1 == argc && !strcmp(name,"html2")) { +- ctxt = htmlCreatePushParserCtxt(&sax,NULL,NULL,0,"stdin", +- XML_CHAR_ENCODING_8859_1); ++ ctxt = htmlCreatePushParserCtxt(&sax,NULL,NULL,0,"stdin",0); + parseChunk = htmlParseChunk; + freeCtxt = htmlFreeParserCtxt; + do_compress_whitespace = 1; only in patch2: unchanged: --- xml2-0.4.orig/debian/patches/0004-Fix-help-msg-of-2csv-tool.patch +++ xml2-0.4/debian/patches/0004-Fix-help-msg-of-2csv-tool.patch @@ -0,0 +1,22 @@ +From: Boyuan Yang <073p...@gmail.com> +Date: Sun, 1 Oct 2017 23:30:13 +0800 +Subject: Fix help msg of 2csv tool + +--- + 2csv.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/2csv.c b/2csv.c +index 7370e8c..c672b56 100644 +--- a/2csv.c ++++ b/2csv.c +@@ -4,7 +4,8 @@ + #include <string.h> + + void usage(void) { +- fputs("usage: 2csv record field [field ...] < in > csv\n",stderr); ++ fputs("usage: 2csv [-q quote] [-d comma] " ++ "record field [field ...] < in > csv\n",stderr); + exit(2); + } +
signature.asc
Description: This is a digitally signed message part.
