[r-cran-yaml] 01/01: diff
Joost van Baal
joostvb at moszumanska.debian.org
Wed Jan 6 19:00:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
joostvb pushed a commit to branch master
in repository r-cran-yaml.
commit f729e8dd97a74e2f49d497502a7fdbcdd8116a98
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date: Wed Jan 6 20:00:47 2016 +0100
diff
---
debian/changelog | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0413147..2b13541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,85 @@ debian has
Source: libyaml Version: 0.1.6-3
+joostvb at nusku:ding% diff -dur libyaml-0.1.6/src r-cran-yaml/src
+
+----------
+
+Само у r-cran-yaml/src: implicit.c
+Само у libyaml-0.1.6/src: Makefile.am
+Само у libyaml-0.1.6/src: Makefile.in
+Само у r-cran-yaml/src: Makevars
+Само у r-cran-yaml/src: r-ext.c
+Само у r-cran-yaml/src: r-ext.h
+diff -dur libyaml-0.1.6/src/scanner.c r-cran-yaml/src/scanner.c
+--- libyaml-0.1.6/src/scanner.c 2016-01-06 16:30:38.000000000 +0100
++++ r-cran-yaml/src/scanner.c 2015-12-22 10:47:20.297487439 +0100
+@@ -1106,6 +1106,13 @@
+ && parser->indent == (ptrdiff_t)parser->mark.column);
+
+ /*
++ * A simple key is required only when it is the first token in the current
++ * line. Therefore it is always allowed. But we add a check anyway.
++ */
++
++ assert(parser->simple_key_allowed || !required); /* Impossible. */
++
++ /*
+ * If the current position may start a simple key, save it.
+ */
+
+Само у r-cran-yaml/src: yaml.h
+diff -dur libyaml-0.1.6/src/yaml_private.h r-cran-yaml/src/yaml_private.h
+--- libyaml-0.1.6/src/yaml_private.h 2014-03-26 19:54:02.000000000 +0100
++++ r-cran-yaml/src/yaml_private.h 2015-12-22 10:47:20.297487439 +0100
+@@ -1,9 +1,9 @@
++#define YAML_VERSION_MAJOR 0
++#define YAML_VERSION_MINOR 1
++#define YAML_VERSION_PATCH 6
++#define YAML_VERSION_STRING "0.1.6"
+
+-#if HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#include <yaml.h>
++#include "yaml.h"
+
+ #include <assert.h>
+ #include <limits.h>
+
+
+----------------
+
+
+diff -dur r-cran-yaml/src/yaml.h libyaml-0.1.6/include/yaml.h
+--- r-cran-yaml/src/yaml.h 2015-12-22 10:47:20.297487439 +0100
++++ libyaml-0.1.6/include/yaml.h 2014-03-26 19:54:02.000000000 +0100
+@@ -26,7 +26,17 @@
+
+ /** The public API declaration. */
+
+-#define YAML_DECLARE(type) type
++#ifdef _WIN32
++# if defined(YAML_DECLARE_STATIC)
++# define YAML_DECLARE(type) type
++# elif defined(YAML_DECLARE_EXPORT)
++# define YAML_DECLARE(type) __declspec(dllexport) type
++# else
++# define YAML_DECLARE(type) __declspec(dllimport) type
++# endif
++#else
++# define YAML_DECLARE(type) type
++#endif
+
+ /** @} */
+
+
+
+-------------------
+
+
+
-- Joost van Baal-Ilić <joostvb at debian.org> Wed, 23 Dec 2015 15:52:52 +0100
r-cran-yaml (2.1.13-2) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-yaml.git
More information about the debian-science-commits
mailing list