[r-cran-yaml] 01/01: cosmetics

[Joost van Baal]

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 6988ded29c55824e0ea2120cabe31468cc53f1e4
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Thu Jan 7 17:39:35 2016 +0100

    cosmetics
---
 debian/changelog | 34 +++++++++++++---------------------
 debian/copyright |  7 ++++---
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f272006..ab1915f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,29 @@
 r-cran-yaml (2.1.13-3) unstable; urgency=low
 
   * UNRELEASED
-  * debian/copyright: add upstream vcs at github and alternative upstream homepage
-    at http://biostat.mc.vanderbilt.edu/wiki/Main/YamlR as comments.
-  * debian/rules: remove convenience copy of libyaml sources before building, use
-    system <yaml.h> in r-ext.c and implicit.c, hack src/Makevars to explicitly
-    link with system -lyaml: get rid of embedded library.
-  * debian/rules: add clean target: clean up after our upstream source hacking
+  * debian/copyright: add upstream vcs at github and alternative upstream
+    homepage at http://biostat.mc.vanderbilt.edu/wiki/Main/YamlR as
+    comments.
+  * debian/rules: remove convenience copy of libyaml sources before
+    building, use system <yaml.h> in r-ext.c and implicit.c, hack
+    src/Makevars to explicitly link with system -lyaml: get rid of
+    embedded library.
+  * debian/rules: add clean target: clean up after our upstream source
+    hacking
   * debian/control: add libyaml-dev to build depends.
 
-  * FIXME: http://cran.r-project.org/doc/manuals/R-admin.html#Customizing-package-compilation
+  * FIXME:
      REJECTED: embedded-library yaml.so
      .
      The current release of LibYAML: 0.1.5 (2014-02-04).
-     Download the source package: http://pyyaml.org/download/libyaml/yaml-0.1.5.tar.gz.
-
-     perhaps this makes use build yaml.so? ->
-     % cat src/Makevars
-     PKG_CPPFLAGS = -I. -DNDEBUG
+     Download the source package:
+     http://pyyaml.org/download/libyaml/yaml-0.1.5.tar.gz.
 
     libyaml-dev: /usr/lib/x86_64-linux-gnu/libyaml.so
 
-    libyaml-0-2 - Fast YAML 1.1 parser and emitter library
     libyaml-0-2: /usr/lib/x86_64-linux-gnu/libyaml-0.so.2
     libyaml-0-2: /usr/lib/x86_64-linux-gnu/libyaml-0.so.2.0.4
 
-
     we have
     src/yaml_private.h:#define YAML_VERSION_STRING "0.1.6"
 
@@ -47,13 +45,7 @@ r-cran-yaml (2.1.13-3) unstable; urgency=low
                  && 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.
           */
      
diff --git a/debian/copyright b/debian/copyright
index 5c0df67..c1ba028 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: yaml
 Upstream-Contact: Jeremy Stephens <jeremy.stephens at vanderbilt.edu>
 Source: https://cran.r-project.org/web/packages/yaml
-Comment: upstream vcs: https://github.com/viking/r-yaml
-Comment: upstream bugtracker: https://github.com/viking/r-yaml/issues
-Comment: alternative upstream homepage: http://biostat.mc.vanderbilt.edu/wiki/Main/YamlR
+Comment: upstream:
+ vcs: https://github.com/viking/r-yaml
+ bugtracker: https://github.com/viking/r-yaml/issues
+ alternative homepage: http://biostat.mc.vanderbilt.edu/wiki/Main/YamlR
 
 Files: *
 Copyright: 2008-2014 Vanderbilt University

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