[r-cran-yaml] 02/03: Canonical CRAN homepage
Andreas Tille
tille at debian.org
Wed Nov 30 21:21:41 UTC 2016
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 7c9a34f88b8b498c6942a54eb505748a2ded495a
Author: Andreas Tille <tille at debian.org>
Date: Wed Nov 30 22:14:29 2016 +0100
Canonical CRAN homepage
---
debian/changelog | 1 +
debian/control | 6 ++++--
debian/copyright | 8 ++++----
debian/docs | 1 +
debian/rules | 43 ++++++++-----------------------------------
5 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 225f06f..069bf1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ r-cran-yaml (2.1.14-1) UNRELEASED; urgency=medium
* rather remove unused files from upstream source than removing these
at build time
* Use Debian packaged libyaml in quilt patch
+ * Canonical CRAN homepage
[ Gordon Ball ]
* Fix autopkgtest (tried to write to a read-only location)
diff --git a/debian/control b/debian/control
index bdb4a82..bff443a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,20 @@ Section: gnu-r
Priority: optional
Build-Depends: debhelper (>= 9),
r-base-dev,
- cdbs,
+ dh-r,
libyaml-dev
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/r-cran-yaml.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/r-cran-yaml.git
-Homepage: https://cran.r-project.org/web/packages/yaml/
+Homepage: https://cran.r-project.org/package=yaml
Package: r-cran-yaml
Architecture: any
Depends: ${shlibs:Depends},
${R:Depends},
${misc:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
Description: Methods to convert R data to YAML and back
This package implements the LibYAML YAML 1.1 parser and emitter for R. YAML is
a human-readable markup language. With it, you can create easily readable
diff --git a/debian/copyright b/debian/copyright
index b96d0a9..662ddad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://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
+Upstream-Contact: Jeremy Stephens <jeremy.stephens at vanderbilt.edu>
+Source: https://cran.r-project.org/package=yaml
Comment: upstream:
vcs: https://github.com/viking/r-yaml
bugtracker: https://github.com/viking/r-yaml/issues
@@ -18,7 +18,7 @@ Files-Excluded: src/api.c
src/yaml_private.h
Files: *
-Copyright: 2008-2014 Vanderbilt University
+Copyright: 2008-2016 Vanderbilt University
Comment: author: Jeremy Stephens
License: Vanderbilt
diff --git a/debian/docs b/debian/docs
index 960011c..fa5271c 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,4 @@
tests
debian/README.test
debian/tests/run-unit-test
+inst/THANKS
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 121c200..41684c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,5 @@
#!/usr/bin/make -f
-DPKG_EXPORT_BUILDFLAGS = 1
-
-# Use hardening flags for linking
-include /usr/share/dpkg/buildflags.mk
-
-## PKG_CFLAGS=$(CFLAGS)
-## PKG_CXXFLAGS=$(CXXFLAGS)
-## PKG_CPPFLAGS=$(CPPFLAGS)
-## PKG_FFLAGS=$(FFLAGS)
-## export PKG_CFLAGS PKG_CXXFLAGS PKG_CPPFLAGS PKG_FFLAGS
-
-makeFlags="LDFLAGS=$(LDFLAGS)"
-
# use for debugging
# extraInstallFlags := --no-clean-on-error
# or manually run
@@ -22,22 +9,12 @@ makeFlags="LDFLAGS=$(LDFLAGS)"
# and/or
# cd src && gcc -std=gnu99 -shared -L/usr/lib/R/lib -Wl,-z,relro -o yaml.so implicit.o r-ext.o -L/usr/lib/R/lib -lR
#
-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
-# 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
-
# 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
@@ -57,17 +34,13 @@ include /usr/share/R/debian/r-cran.mk
# FIXME contact upstream, do stress-test our yaml.so; perhaps we'd better ship a
# src/Makefile: this could be useable by both us and upstream.
-pre-build::
- test -d src,bak || cp -a src src,bak
- sed -i 's/#include "yaml.h"/#include <yaml.h>/' src/implicit.c
- sed -i 's/#include "yaml.h"/#include <yaml.h>/' src/r-ext.h
- echo 'PKG_LIBS = -lyaml' >> src/Makevars
-common-install-arch::
- rm -vf $(debRlib)/$(cranNameOrig)/LICENSE $(debRlib)/$(cranNameOrig)/CHANGELOG $(debRlib)/$(cranNameOrig)/THANKS
- dh_installdocs -p$(package) ./inst/THANKS
- dh_installchangelogs -p$(package) ./inst/CHANGELOG
+%:
+ dh $@ --buildsystem R
+
+override_dh_install:
+ dh_install
+ find debian -name LICENSE -o -name CHANGELOG -o -name THANKS | xargs -r rm -f
-clean::
- test -d src,bak && rm -vfr src || true
- test -d src,bak && mv src,bak src || true
+override_dh_installchangelogs:
+ dh_installchangelogs ./inst/CHANGELOG
--
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