Commit be44b990 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.0.1-6

r-base (3.0.1-6) unstable; urgency=low

  * debian/r-cran.mk: Undo brown paper bag error and add pipe symbol

  * debian/rules: Do not run checks on kFreeBSD as it timed out
parent a06be045
r-base (3.0.1-6) unstable; urgency=low
* debian/r-cran.mk: Undo brown paper bag error and add pipe symbol
* debian/rules: Do not run checks on kFreeBSD as it timed out
-- Dirk Eddelbuettel <edd@debian.org> Mon, 29 Jul 2013 19:35:24 -0500
r-base (3.0.1-5) unstable; urgency=low
* debian/rules: Make a minor debian/rules clean more robust by using
......
......@@ -104,7 +104,7 @@ clean::
## the re-invocation of a build process should not
## leave a footprint in Debian's diff.gz.
if test -d src; then \
find src -regex ".*\.o" \
find src -regex ".*\.o" | \
xargs --no-run-if-empty -r rm; \
fi
rm -f config.log config.status
......
......@@ -344,7 +344,10 @@ check-stamp:
## edd 11 Oct 2005 also disable on hppa
## edd 15 Apr 2008 call inside of xvfb-run for virtual x11, and switch to check-all
ifeq "$(findstring $(arch), hppa arm)" ""
## edd 29 Jul 2013 also disable on kFreeBSD
ifneq ($(buildos),kfreebsd)
-xvfb-run make check-all
endif
endif
touch check-stamp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment