[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 b6d1d5177ff8c9e2f43d751ddbd3ff10e07df23c
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Thu Jan 7 17:30:56 2016 +0100

    cosmetics
---
 debian/changelog | 21 +++++----------------
 debian/rules     |  3 +++
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90b4fdc..f272006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,17 @@
 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.
+  * 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
      REJECTED: embedded-library yaml.so
-
-     N:    The given ELF object appears to have been statically linked to a
-     N:    library.
-     ...
-     N:    Refer to Debian Policy Manual section 4.13 (Convenience copies of code)
-     N:    for details.
-
-     .
-     Description: This package implements the libyaml YAML 1.1 parser and emitter (http://pyyaml.org/wiki/LibYAML) for R.
      .
-     http://pyyaml.org/wiki/LibYAML
-     LibYAML is a YAML 1.1 parser and emitter written in C.
      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.
 
diff --git a/debian/rules b/debian/rules
index 64e85c6..4aca176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ include /usr/share/R/debian/r-cran.mk
 
 # see also /etc/R/Makeconf and /usr/lib/R/etc/Makeconf
 # and https://cran.r-project.org/doc/manuals/r-release/R-exts.html
+# and https://cran.r-project.org/doc/manuals/R-admin.html#Customizing-package-compilation
+#
+# see http://pyyaml.org/wiki/LibYAML for libyaml upstream docs
 pre-build::
 	test -d src,bak || cp -a src src,bak
 	rm -vf src/api.c src/dumper.c src/emitter.c src/loader.c src/parser.c src/reader.c src/scanner.c src/writer.c src/yaml.h

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