[r-cran-yaml] 01/02: Merge branch 'master' into debian/jessie-backports

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository r-cran-yaml.

commit 1fa35bdf419fc1ece214971005ebee0c24446591
Merge: 3ef23f5 68293bb
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 9 15:22:02 2017 +0200

    Merge branch 'master' into debian/jessie-backports

 DESCRIPTION                                        |   12 +-
 MD5                                                |   30 +-
 R/as.yaml.R                                        |    4 +-
 R/yaml.load.R                                      |    2 +-
 R/yaml.load_file.R                                 |    2 +-
 debian/README.test                                 |    9 +
 debian/changelog                                   |   25 +
 debian/control                                     |   23 +-
 debian/copyright                                   |   26 +-
 debian/docs                                        |    4 +
 debian/lintian-overrides                           |    2 +
 ...extra_declaration_from_r-cran-yaml_yaml.h.patch |   27 +
 debian/patches/series                              |    2 +
 debian/patches/use_debian_packaged_libyaml.patch   |   37 +
 debian/patches/use_original_yaml_private.h.patch   |   24 +
 debian/rules                                       |   44 +-
 debian/tests/control                               |    3 +
 debian/tests/run-unit-test                         |   17 +
 debian/upstream/metadata                           |    3 +
 debian/watch                                       |    7 +-
 inst/CHANGELOG                                     |    4 +
 inst/THANKS                                        |    3 +-
 inst/tests/test_as_yaml.R                          |    5 +
 man/as.yaml.Rd                                     |    6 +-
 src/api.c                                          |   14 +-
 src/emitter.c                                      |    4 +-
 src/implicit.c                                     | 1874 +++++++++-----------
 src/r-ext.c                                        |   26 +-
 src/scanner.c                                      |    7 -
 src/yaml.h                                         |   12 +
 src/yaml_private.h                                 |    4 +-
 31 files changed, 1112 insertions(+), 1150 deletions(-)

diff --cc debian/changelog
index 8230920,db58932..2e7d467
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,34 @@@
+ r-cran-yaml (2.1.14-1) unstable; urgency=medium
+ 
+   [ Andreas Tille ]
+   * Team Upload
+   * New upstream version
+   * Upstream is patching libyaml resulting in incompatible API thus we
+     need to stick to the code copy
+   * Canonical CRAN homepage
+   * Move some metadata from d/copyright to d/upstream/metadata
+ 
+   [ Gordon Ball ]
+   * Fix autopkgtest (tried to write to a read-only location)
+ 
+  -- Andreas Tille <tille at debian.org>  Sun, 11 Dec 2016 17:43:20 +0100
+ 
+ r-cran-yaml (2.1.13-5) unstable; urgency=medium
+ 
+   * Team upload
+   * cme fix dpkg-control
+   * do not pin to specific libyaml-dev version
+     Closes: #837246, #813049
+   * Add autopkgtest
+ 
+  -- Andreas Tille <tille at debian.org>  Sat, 10 Sep 2016 15:50:54 +0200
+ 
 +r-cran-yaml (2.1.13-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Sat, 09 Jul 2016 13:28:04 +0200
 +
  r-cran-yaml (2.1.13-4) unstable; urgency=low
  
    * debian/control: fix typo in Depends: libyaml-0.2 -> libyaml-0-2.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-yaml.git