[libyaml-libyaml-perl] 01/01: Merge branch 'master' into gregoa/use-system-yaml

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch gregoa/use-system-yaml
in repository libyaml-libyaml-perl.

commit 7f924fd3a417bccd9caba9e4d43616fea89cb1d2
Merge: a838a46 ce2d354
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Feb 14 16:10:38 2016 +0100

    Merge branch 'master' into gregoa/use-system-yaml

 CONTRIBUTING                                       | 11 ++-
 Changes                                            | 29 +++++++-
 LICENSE                                            |  8 +-
 LibYAML/emitter.c                                  |  9 +--
 LibYAML/loader.c                                   | 12 +++
 LibYAML/parser.c                                   |  2 +-
 LibYAML/perl_libyaml.c                             | 47 ++++++------
 LibYAML/reader.c                                   | 10 ++-
 LibYAML/scanner.c                                  | 43 +++++++----
 LibYAML/update.sh                                  | 43 +++++------
 LibYAML/writer.c                                   |  2 +-
 LibYAML/yaml.h                                     |  2 +-
 LibYAML/yaml_private.h                             | 34 +++++++--
 MANIFEST                                           |  5 +-
 META.json                                          | 12 +--
 META.yml                                           |  8 +-
 Makefile.PL                                        | 16 ++--
 README                                             | 44 +++++++----
 debian/changelog                                   | 31 ++++++--
 debian/control                                     |  4 +-
 debian/copyright                                   | 43 ++++++-----
 debian/patches/CVE-2014-2525.patch                 | 35 ---------
 debian/patches/fix_ftbfs_hardening_flags.diff      | 42 -----------
 ...gainst-overflows-in-indent-and-flow_level.patch | 86 ----------------------
 debian/patches/libyaml-string-overflow.patch       | 26 -------
 debian/patches/series                              |  4 -
 debian/tests/pkg-perl/{test-files => smoke-files}  |  0
 debian/tests/pkg-perl/{module-name => use-name}    |  0
 inc/Spiffy.pm                                      |  2 +-
 inc/Test/Base.pm                                   |  3 +-
 lib/YAML/LibYAML.pm                                |  1 +
 lib/YAML/LibYAML.pod                               |  6 +-
 lib/YAML/XS.pm                                     |  2 +-
 lib/YAML/XS.pod                                    |  7 +-
 t/{release-pod-syntax.t => author-pod-syntax.t}    |  5 +-
 t/dump-heuristics.t                                | 10 +++
 t/error.t                                          |  9 ++-
 t/utf8.t                                           |  6 +-
 38 files changed, 300 insertions(+), 359 deletions(-)

diff --cc debian/patches/series
index c54bc7e,daae630..6bf8fa9
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,2 +1,3 @@@
- fix_ftbfs_hardening_flags.diff
  disable-update.sh.patch
- libyaml-string-overflow.patch
  libyaml-node-id-hardening.patch
- libyaml-guard-against-overflows-in-indent-and-flow_level.patch
- CVE-2014-2525.patch
 +use-system-yaml.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libyaml-libyaml-perl.git