Hello,

> I opened an upstream ticket for this, thanks
> https://github.com/yaml/libyaml/issues/60
> 
> I might end up in disabling the testsuite for the haskell package, in case 
> the regression can't
> be traced
> (can you please ping maybe your upstream? it might be something that needs 
> changed in pyyaml...)
> 

James Clarke got the issue and fixed it properly I would say.

https://launchpad.net/~costamagnagianfranco/+archive/ubuntu/locutusofborg-ppa

a no-change rebuild in my ppa looks really better now (please double check), 
and I think this updated
debdiff can be uploaded in unstable.

I also changed the Homepage field, but I still prefer to hear the maintainer, 
before making a decision :)

G.
diff -Nru libyaml-0.1.7/debian/changelog libyaml-0.1.7/debian/changelog
--- libyaml-0.1.7/debian/changelog      2016-10-01 04:06:09.000000000 +0200
+++ libyaml-0.1.7/debian/changelog      2017-06-23 18:29:36.000000000 +0200
@@ -1,3 +1,16 @@
+libyaml (0.1.7-2.1) unstable; urgency=medium
+
+  [ James Clarke ]
+  * debian/patches/testsuite-fix.patch:
+    - Skip trailing document terminator at the end of the
+      stream. (Closes: #865675)
+
+  [ Gianfranco Costamagna ]
+  * Non-maintainer upload.
+  * Move watch and homepage to new github maintained repo (Closes: #865709).
+
+ -- Gianfranco Costamagna <[email protected]>  Fri, 23 Jun 2017 
18:29:36 +0200
+
 libyaml (0.1.7-2) unstable; urgency=medium
 
   * Clean doxygen-generated documentation with dh_doxygen.
diff -Nru libyaml-0.1.7/debian/control libyaml-0.1.7/debian/control
--- libyaml-0.1.7/debian/control        2016-10-01 03:21:44.000000000 +0200
+++ libyaml-0.1.7/debian/control        2017-06-23 18:29:36.000000000 +0200
@@ -8,7 +8,7 @@
  dh-autoreconf
 Build-Depends-Indep: doxygen (>= 1.8.4-1~)
 Standards-Version: 3.9.6
-Homepage: http://pyyaml.org/wiki/LibYAML
+Homepage: https://github.com/yaml/libyaml
 Vcs-Git: git://andersk.mit.edu/libyaml.git
 Vcs-Browser: http://andersk.mit.edu/gitweb/libyaml.git
 
diff -Nru libyaml-0.1.7/debian/copyright libyaml-0.1.7/debian/copyright
--- libyaml-0.1.7/debian/copyright      2016-10-01 03:17:23.000000000 +0200
+++ libyaml-0.1.7/debian/copyright      2017-06-23 18:29:36.000000000 +0200
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: LibYAML
 Upstream-Contact: Kirill Simonov <[email protected]>
-Source: http://pyyaml.org/wiki/LibYAML
+Source: https://github.com/yaml/libyaml
 
 Files: *
 Copyright: 2006, Kirill Simonov <[email protected]>
diff -Nru libyaml-0.1.7/debian/patches/series 
libyaml-0.1.7/debian/patches/series
--- libyaml-0.1.7/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libyaml-0.1.7/debian/patches/series 2017-06-23 18:29:36.000000000 +0200
@@ -0,0 +1 @@
+testsuite-fix.patch
diff -Nru libyaml-0.1.7/debian/patches/testsuite-fix.patch 
libyaml-0.1.7/debian/patches/testsuite-fix.patch
--- libyaml-0.1.7/debian/patches/testsuite-fix.patch    1970-01-01 
01:00:00.000000000 +0100
+++ libyaml-0.1.7/debian/patches/testsuite-fix.patch    2017-06-23 
18:29:36.000000000 +0200
@@ -0,0 +1,30 @@
+Bug: https://github.com/yaml/libyaml/issues/60
+From e5ebb70a01cc0fbd9e519050d51d704f58c2a33d Mon Sep 17 00:00:00 2001
+From: James Clarke <[email protected]>
+Date: Thu, 29 Jun 2017 02:26:09 +0100
+Subject: [PATCH 2/2] Skip trailing document terminator at the end of the
+ stream
+
+---
+ src/emitter.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/emitter.c b/src/emitter.c
+index c593a7d..1502590 100644
+--- a/src/emitter.c
++++ b/src/emitter.c
+@@ -649,14 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
+ 
+     else if (event->type == YAML_STREAM_END_EVENT)
+     {
+-        if (emitter->open_ended)
+-        {
+-            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+-                return 0;
+-            if (!yaml_emitter_write_indent(emitter))
+-                return 0;
+-        }
+-
+         if (!yaml_emitter_flush(emitter))
+             return 0;
+ 
diff -Nru libyaml-0.1.7/debian/watch libyaml-0.1.7/debian/watch
--- libyaml-0.1.7/debian/watch  2016-10-01 03:08:01.000000000 +0200
+++ libyaml-0.1.7/debian/watch  2017-06-23 18:29:36.000000000 +0200
@@ -1,2 +1,2 @@
 version=3
-http://pyyaml.org/download/libyaml/yaml-(.*)\.tar\.gz
+https://github.com/yaml/libyaml/releases .*/v?(\d\S*)\.tar\.gz

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to