[r-cran-yaml] 03/04: rather remove unused files from upstream source than removing these at build time

Andreas Tille tille at debian.org
Tue Nov 29 16:07:46 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 350b56bfee2f24120fffd8d821cf109c7f9921ae
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 29 16:48:37 2016 +0100

    rather remove unused files from upstream source than removing these at build time
---
 debian/changelog | 2 ++
 debian/copyright | 1 +
 debian/rules     | 1 -
 debian/watch     | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8bda48..454d217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ r-cran-yaml (2.1.14-1) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * Team Upload
   * New upstream version
+  * rather remove unused files from upstream source than removing these
+    at build time
 
   [ Gordon Ball ]
   * Fix autopkgtest (tried to write to a read-only location)
diff --git a/debian/copyright b/debian/copyright
index 86ee109..40596b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ 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-Excluded: 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
 
 Files: *
 Copyright: 2008-2014 Vanderbilt University
diff --git a/debian/rules b/debian/rules
index 37dcbf9..121c200 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,6 @@ include /usr/share/R/debian/r-cran.mk
 #  src/Makefile: this could be useable by both us and upstream.
 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
 	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
diff --git a/debian/watch b/debian/watch
index d3ac537..7ec27f5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,6 +6,6 @@
 #     debian/upstream/signing-key.asc.
 # at 2016-01-08, upstream did not supply signatures
 # (current: 2.1.13 released 12-Jun-2014)
-version=3
-opts="uversionmangle=s/-/\./" \
+version=4
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
 	    http://cran.r-project.org/src/contrib/yaml_([-\d\.]*)\.tar.gz

-- 
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