[r-cran-yaml] 01/01: cleanup debian/changelog

[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 e3c0057f1453b1bd5ea82fa4cc0783f17856b468
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Fri Jan 8 06:22:21 2016 +0100

    cleanup debian/changelog
---
 debian/changelog | 64 +++-----------------------------------------------------
 debian/rules     | 17 +++++++++++++++
 2 files changed, 20 insertions(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58ebfc3..aea1117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,9 @@ r-cran-yaml (2.1.13-3) unstable; urgency=low
     This version is shipped with jessie (current stable) and stretch
     (current testing).  Add explicit versioned libyaml-0.2 (= 0.1.6-3)
     to Depends (next to ${shlibs:Depends} which yields unversioned
-    libyaml-0.2 dependency).
+    libyaml-0.2 dependency): see YAML_VERSION_STRING in
+    src/yaml_private.h.  Upstream LibYAML available from
+    http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz.
 
   * FIXME:
     P: r-cran-yaml source: debian-watch-may-check-gpg-signature
@@ -26,66 +28,6 @@ r-cran-yaml (2.1.13-3) unstable; urgency=low
      downloaded and verified against a keyring stored in
      debian/upstream/signing-key.asc.
 
-  * 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.
-
-    libyaml-dev: /usr/lib/x86_64-linux-gnu/libyaml.so
-
-    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"
-
-    joostvb at nusku:ding% diff -dur libyaml-0.1.6/src r-cran-yaml/src
-
-    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"
-
-    diff -dur r-cran-yaml/src/yaml.h libyaml-0.1.6/include/yaml.h
-     
-      -------------------
-
-      * installing *source* package ‘yaml’ ...
-      files ‘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’ are
-      missing
-      file ‘src/r-ext.h’ has the wrong MD5 checksum
-      ** libs
-      ....
-      ** testing if installed package can be loaded
-      Error in dyn.load(file, DLLpath = DLLpath, ...) : 
-        unable to load shared object '.../r-cran-yaml-2.1.13/
-        debian/r-cran-yaml/usr/lib/R/site-library/yaml/libs/yaml.so':
-        .../r-cran-yaml-2.1.13/debian/r-cran-yaml/usr/lib/R/
-        site-library/yaml/libs/yaml.so: undefined symbol:
-        yaml_sequence_start_event_initialize
-     Error: loading failed
-      
-     it compiles yaml.so without any error
-         this yaml.so is linked with
-             libR.so => /usr/lib/libR.so (0x00007f7614ddf000)
-      
-    /usr/lib/x86_64-linux-gnu/libyaml-0.so.2.0.4 is _not_ linked with libR.so
-
  -- 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
diff --git a/debian/rules b/debian/rules
index df38cde..e8788e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,23 @@ include /usr/share/R/debian/r-cran.mk
 #      #include "yaml_private.h"
 # since libyaml-dev ships only /usr/include/yaml.h
 
+# our hacking of upstream is noticed during build:
+#  * installing *source* package ‘yaml’ ...
+#  files ‘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’ are missing
+#  files ‘src/Makevars’, ‘src/implicit.c’, ‘src/r-ext.h’ have the wrong MD5 checksums
+# FIXME: get rid of these warnings
+
+# we need -lyaml , if this lacks we get:
+#      ** testing if installed package can be loaded
+#      Error in dyn.load(file, DLLpath = DLLpath, ...) :·
+#        unable to load shared object '.../r-cran-yaml-2.1.13/
+#        debian/r-cran-yaml/usr/lib/R/site-library/yaml/libs/yaml.so':
+#        .../r-cran-yaml-2.1.13/debian/r-cran-yaml/usr/lib/R/
+#        site-library/yaml/libs/yaml.so: undefined symbol:
+#        yaml_sequence_start_event_initialize
+#     Error: loading failed
+# during build
+
 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