Commit d263c95b authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.0.1-4

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

  * debian/rules: Set optimisation to -O2 on kFreeBSD	(Closes: #714506)
  
  * debian/r-cran.mk: Minor tweak to regexp in 'make clean' step

  * debian/watch: Adjusted path to look in R-3/ directory
parent b47d4aa6
r-base (3.0.1-4) unstable; urgency=low
* debian/rules: Set optimisation to -O2 on kFreeBSD (Closes: #714506)
* debian/r-cran.mk: Minor tweak to regexp in 'make clean' step
* debian/watch: Adjusted path to look in R-3/ directory
-- Dirk Eddelbuettel <edd@debian.org> Fri, 26 Jul 2013 06:24:24 -0500
r-base (3.0.1-3) unstable; urgency=low
* debian/rules: Tweak the pdf creation to overcome error from missing
......
......@@ -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
......
......@@ -33,7 +33,8 @@ debcnf := $(debbase)/$(corepackage)/etc/R
## updated rules throughout
arch := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
buildarch := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
## edd 26 Jul 2013 also use DEB_HOST_ARCH_OS to catch kFreeBSD
buildos := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
#export DH_VERBOSE = 1
# edd 15 Aug 2001 default to blas, atlas can override it
......@@ -135,6 +136,12 @@ ifeq ($(arch),powerpc64)
optimflags += -mminimal-toc
endif
## edd 26 Jul 2013 kFreeBSD wants -O2 per #714506
ifeq ($(buildos),kfreebsd)
optimflags = -O2 -pipe
endif
## edd 04 Apr 2006 generalize from old compilerflags to per-compiler
## edd 11 Oct 2011 -std=gnu goes to CC (thanks to Kurt Hornik)
cflags = $(optimflags)
......@@ -445,7 +452,6 @@ install-arch-stamp:
rdocdir=$(debtmp)/usr/share/R/doc \
install-pdf
# the indep package r-doc-info is made now
make prefix=$(debtmp)/usr \
infodir=$(debtmp)/usr/share/info install-info
......@@ -453,6 +459,9 @@ install-arch-stamp:
# move the pdf manual files listed in r-doc-pdf.files into r-doc-pdf
dh_movefiles --sourcedir=debian/$(corepackage) -p$(pdfpackage)
## edd 27 May 2013 remove the token fullrefman.pdf we added to facilitate build
rm debian/$(pdfpackage)/usr/share/R/doc/manual/fullrefman.pdf
# move the html manual files in r-doc-html.files into r-doc-html
dh_movefiles --sourcedir=debian/$(corepackage) -p$(htmlpackage)
......
......@@ -2,4 +2,4 @@
version=2
# This is one format for an HTTP site, which is the same as the FTP format
http://cran.r-project.org/src/base/R-2/R-([-0-9\.]*).tar.gz
http://cran.r-project.org/src/base/R-3/R-([-0-9\.]*).tar.gz
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