Commit ee13f771 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.7.2-2

r-base (2.7.2-2) unstable; urgency=low

  * debian/r-cran.mk: Switch from cdbs snipped dpatch.mk to simple-patchsys.mk

  * debian/{Renviron.site,Rprofile.site}: Install simple stanza files with 
    example usage into /etc/R/ with softlinks from $R_HOME/etc as for the
    other config files. Thanks to Christian Hudon for the suggestion.
  							(Closes: #498520)
  
  * src/library/base/R/dcf.R: Correct regexp for Debian-style control field
    writing as per the one-line patch by Charles Blundell to r-devel / r-bugs
    which should help us in cran2deb as well

  * debian/control: Switched Build-Depends from tcl/tk 8.4 to 8.5 
parent a9316782
## Emacs please make this -*- R -*-
## empty Renviron.site for R on Debian
##
## Copyright (C) 2008 Dirk Eddelbuettel and GPL'ed
##
## see help(Startup) for documentation on ~/.Renviron and Renviron.site
# ## Example ~/.Renviron on Unix
# R_LIBS=~/R/library
# PAGER=/usr/local/bin/less
# ## Example .Renviron on Windows
# R_LIBS=C:/R/library
# MY_TCLTK="c:/Program Files/Tcl/bin"
# ## Example of setting R_DEFAULT_PACKAGES (from R CMD check)
# R_DEFAULT_PACKAGES='utils,grDevices,graphics,stats'
# # this loads the packages in the order given, so they appear on
# # the search path in reverse order.
## Emacs please make this -*- R -*-
## empty Rprofile.site for R on Debian
##
## Copyright (C) 2008 Dirk Eddelbuettel and GPL'ed
##
## see help(Startup) for documentation on ~/.Rprofile and Rprofile.site
# ## Example of .Rprofile
# options(width=65, digits=5)
# options(show.signif.stars=FALSE)
# setHook(packageEvent("grDevices", "onLoad"),
# function(...) grDevices::ps.options(horizontal=FALSE))
# set.seed(1234)
# .First <- function() cat("\n Welcome to R!\n\n")
# .Last <- function() cat("\n Goodbye!\n\n")
# ## Example of Rprofile.site
# local({
# # add MASS to the default packages, set a CRAN mirror
# old <- getOption("defaultPackages"); r <- getOption("repos")
# r["CRAN"] <- "http://my.local.cran"
# options(defaultPackages = c(old, "MASS"), repos = r)
#})
r-base (2.7.2-2) unstable; urgency=low
* debian/r-cran.mk: Switch from cdbs snipped dpatch.mk to simple-patchsys.mk
* debian/{Renviron.site,Rprofile.site}: Install simple stanza files with
example usage into /etc/R/ with softlinks from $R_HOME/etc as for the
other config files. Thanks to Christian Hudon for the suggestion.
(Closes: #498520)
* src/library/base/R/dcf.R: Correct regexp for Debian-style control field
writing as per the one-line patch by Charles Blundell to r-devel / r-bugs
which should help us in cran2deb as well
* debian/control: Switched Build-Depends from tcl/tk 8.4 to 8.5
-- Dirk Eddelbuettel <edd@debian.org> Sat, 13 Sep 2008 17:07:31 -0500
r-base (2.7.2-1) unstable; urgency=low
* New upstream version released a few hours ago
......
......@@ -3,7 +3,7 @@ Section: math
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Standards-Version: 3.8.0
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.4-dev, tk8.4-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 5.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 5.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html
Homepage: http://www.r-project.org/
Package: r-base
......
......@@ -7,11 +7,12 @@
# packages. Note that you still need to provide the other files in debian/*,
# in particular control, changelog and copyright.
#
# Copyright 2003-2007 by Dirk Eddelbuettel <edd@debian.org>
# Copyright 2003-2008 by Dirk Eddelbuettel <edd@debian.org>
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/langcore.mk
include /usr/share/cdbs/1/rules/dpatch.mk
## include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
# awk command to extract word after Package or Bundle, lowercased
awkString := "'/^(Package|Bundle):/ {print tolower($$2) }'"
......
......@@ -27,6 +27,7 @@ debdoc := $(debbase)/$(corepackage)/usr/share/doc/$(corepackage)
debmat := $(debbase)/$(nmathpackage)
debetc := $(debbase)/$(corepackage)/usr/lib/R/etc
debinf := $(debbase)/$(infopackage)
debcnf := $(debbase)/$(corepackage)/etc/R
## edd 24 Oct 2005 use DEB_BUILD_GNU_CPU, not DEB_BUILD_GNU_TYPE
## updated rules throughout
......@@ -457,12 +458,17 @@ install-arch-stamp:
# edd 24 Sep 2006 idem for ldpaths
# edd 21 Jun 2008 do not move Renviron to /etc/R as ucf will handle this,
# but still provide the softlink from /etc/R here
# edd 13 Sep 2008 install Rprofile.site and Renviron.site and link back
install -m 0644 debian/Rprofile.site $(debcnf)
install -m 0644 debian/Renviron.site $(debcnf)
(cd $(debetc); \
cat $(debbase)/Renviron-R_LIBS.patch | patch --verbose; \
mv Makeconf repositories ldpaths ../../../../etc/R/; \
mv Renviron Renviron.ucf; \
ln -s /etc/R/Makeconf .; \
ln -s /etc/R/Renviron .; \
ln -s /etc/R/Renviron.site .; \
ln -s /etc/R/Rprofile.site .; \
ln -s /etc/R/ldpaths .; \
ln -s /etc/R/repositories . )
# cat $(debbase)/Renviron-R_PAPERSIZE.patch | patch --verbose;
......
......@@ -133,7 +133,8 @@ function(x, file = "", append = FALSE,
## * We have to handle multiple fields per record.
escape_paragraphs <- function(s)
gsub("\n[[:space:]]*\n", "\n .\n ", s)
gsub("\n \\.([^\n])","\n .\\1", gsub("\n[[:space:]]*\n", "\n .\n ",s))
## edd: applied patch by Charles Blundell from r-devel 13 Sep 2008
if(!is.data.frame(x))
x <- as.data.frame(x, stringsAsFactors = FALSE)
......
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