[r-cran-yaml] 01/03: Use Debian packaged libyaml in quilt patch

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-yaml.

commit 946aa22d81ba7dd6f8901aad75839bdc1f6caf71
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 30 21:57:32 2016 +0100

    Use Debian packaged libyaml in quilt patch
---
 debian/changelog                                 |  1 +
 debian/patches/series                            |  1 +
 debian/patches/use_debian_packaged_libyaml.patch | 37 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 454d217..225f06f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ r-cran-yaml (2.1.14-1) UNRELEASED; urgency=medium
   * New upstream version
   * rather remove unused files from upstream source than removing these
     at build time
+  * Use Debian packaged libyaml in quilt patch
 
   [ Gordon Ball ]
   * Fix autopkgtest (tried to write to a read-only location)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b672b8e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_debian_packaged_libyaml.patch
diff --git a/debian/patches/use_debian_packaged_libyaml.patch b/debian/patches/use_debian_packaged_libyaml.patch
new file mode 100644
index 0000000..c30607d
--- /dev/null
+++ b/debian/patches/use_debian_packaged_libyaml.patch
@@ -0,0 +1,37 @@
+Authors: Andreas Tille <tille at debian.org>
+Las-Update: Tue, 29 Nov 2016 16:39:02 +0100
+Description: Enable use of Debian packaged libyaml
+  upstream r-ext.h has:
+       #include "yaml.h"
+       #include "yaml_private.h"
+  should be
+       #include <yaml.h>
+       #include "yaml_private.h"
+  since libyaml-dev ships only /usr/include/yaml.h
+
+--- a/src/Makevars
++++ b/src/Makevars
+@@ -1 +1,2 @@
+ PKG_CPPFLAGS = -I. -DNDEBUG
++PKG_LIBS = -lyaml
+--- a/src/implicit.c
++++ b/src/implicit.c
+@@ -1,6 +1,6 @@
+ /* Generated by re2c 0.16 */
+ #line 1 "implicit.re"
+-#include "yaml.h"
++#include <yaml.h>
+ 
+ yaml_char_t *
+ find_implicit_tag(str, len)
+--- a/src/r-ext.h
++++ b/src/r-ext.h
+@@ -9,7 +9,7 @@
+ #include "R_ext/Parse.h"
+ #include "R_ext/Print.h"
+ #include "R_ext/PrtUtil.h"
+-#include "yaml.h"
++#include <yaml.h>
+ #include "yaml_private.h"
+ 
+ #define REAL_BUF_SIZE 256

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