[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 e6c436b716933467b9a4b6e41571f282db8dbb93
Merge: f5f4e8b baab422
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Aug 22 18:31:50 2016 +0200

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

 CONTRIBUTING           |  2 +-
 Changes                |  4 +++
 LibYAML/perl_libyaml.c | 69 ++++++++++++++++++++++++++++++--------------------
 LibYAML/perl_libyaml.h |  1 +
 MANIFEST               |  2 +-
 META.json              |  7 ++---
 META.yml               |  5 ++--
 Makefile.PL            |  4 +--
 debian/changelog       | 12 ++++++---
 debian/control         | 16 +++++-------
 debian/copyright       |  2 +-
 debian/rules           |  2 ++
 lib/YAML/LibYAML.pm    |  2 +-
 lib/YAML/LibYAML.pod   |  2 +-
 lib/YAML/XS.pm         |  2 +-
 lib/YAML/XS.pod        |  2 +-
 t/author-pod-syntax.t  |  4 +--
 17 files changed, 82 insertions(+), 56 deletions(-)

diff --cc debian/control
index 5fe348b,0b8c2fb..dbba03b
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,16 +1,17 @@@
  Source: libyaml-libyaml-perl
+ Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+ Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
+            gregor herrmann <gregoa at debian.org>
  Section: perl
+ Testsuite: autopkgtest-pkg-perl
  Priority: optional
  Build-Depends: debhelper (>= 9.20120312),
 +               libyaml-dev,
                 perl
- Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
- Uploaders: Ryan Niebur <ryan at debian.org>,
-            Jonathan Yu <jawnsy at cpan.org>,
-            Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
-            gregor herrmann <gregoa at debian.org>
- Standards-Version: 3.9.7
- Homepage: https://metacpan.org/release/YAML-LibYAML
- Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libyaml-libyaml-perl.git
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libyaml-libyaml-perl.git
- Testsuite: autopkgtest-pkg-perl
+ Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libyaml-libyaml-perl.git
+ Homepage: https://metacpan.org/release/YAML-LibYAML
  
  Package: libyaml-libyaml-perl
  Architecture: any
diff --cc debian/rules
index 9da9dfe,73c5dbc..b6958ae
--- a/debian/rules
+++ b/debian/rules
@@@ -1,28 -1,6 +1,30 @@@
  #!/usr/bin/make -f
  
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+ 
 +LIBYAML=api.c \
 +		config.h \
 +		dumper.c \
 +		emitter.c \
 +		loader.c \
 +		parser.c \
 +		reader.c \
 +		scanner.c \
 +		writer.c \
 +		yaml.h \
 +		yaml_private.h
 +
  %:
  	dh $@
 +
 +override_dh_clean:
 +	for f in $(LIBYAML) ; do \
 +		[ ! -e $(CURDIR)/LibYAML/$$f.disabled ] || mv -v $(CURDIR)/LibYAML/$$f.disabled $(CURDIR)/LibYAML/$$f \
 +	; done
 +	dh_clean
 +
 +override_dh_auto_configure:
 +	for f in $(LIBYAML) ; do \
 +		[ ! -e $(CURDIR)/LibYAML/$$f ] || mv -v $(CURDIR)/LibYAML/$$f $(CURDIR)/LibYAML/$$f.disabled \
 +	; done
 +	dh_auto_configure

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