Commit 8b83c048 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.6.1-2

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

  * debian/control: Replace Build-Depends: on'refblas3-dev | atlas3-base-dev' 
    with 'libblas-dev' to use the new gfortran-built BLAS libraries. Thanks 
    to Riku Voipio for the heads-up and patch.		(Closes: #461767)

  * debian/control: Likewise set the Depends: for the quasi-virtual
    r-base-dev on 'libblas-dev' to enfore use of the new BLAS.

  * debian/control: Update Standards-Version: to current value.
  
  * debian/{r-base-core,r-recommended}.lintian: Add a few silencers for
    the 'package-contains-empty-directory' warnings.
parent 88896d6a
r-base (2.6.1-2) unstable; urgency=low
* debian/control: Replace Build-Depends: on'refblas3-dev | atlas3-base-dev'
with 'libblas-dev' to use the new gfortran-built BLAS libraries. Thanks
to Riku Voipio for the heads-up and patch. (Closes: #461767)
* debian/control: Likewise set the Depends: for the quasi-virtual
r-base-dev on 'libblas-dev' to enfore use of the new BLAS.
* debian/control: Update Standards-Version: to current value.
* debian/{r-base-core,r-recommended}.lintian: Add a few silencers for
the 'package-contains-empty-directory' warnings.
-- Dirk Eddelbuettel <edd@debian.org> Sun, 20 Jan 2008 20:24:52 -0600
r-base (2.6.1-1) unstable; urgency=low
* New upstream version released this morning
......
......@@ -3,8 +3,8 @@ Section: math
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Uploaders: Douglas Bates <bates@stat.wisc.edu>
Standards-Version: 3.7.2
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), refblas3-dev | atlas3-base-dev, 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, tetex-bin, tetex-extra, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x-dev
Standards-Version: 3.7.3
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, 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, tetex-bin, tetex-extra, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x-dev
Package: r-base
Architecture: all
......@@ -65,7 +65,7 @@ Description: GNU R core of statistical computing language and environment
Package: r-base-dev
Architecture: all
Section: devel
Depends: r-base-core (>= ${source:Version}), build-essential, gcc, g++, gfortran, refblas3-dev | atlas3-base-dev | libblas-3.so, libncurses5-dev, libreadline5-dev, libjpeg62-dev, libpcre3-dev, libpng12-dev, zlib1g-dev, libbz2-dev, dpatch
Depends: r-base-core (>= ${source:Version}), build-essential, gcc, g++, gfortran, libblas-dev, libncurses5-dev, libreadline5-dev, libjpeg62-dev, libpcre3-dev, libpng12-dev, zlib1g-dev, libbz2-dev, dpatch
Suggests: cdbs, debhelper
Description: GNU R installation of auxiliary GNU R packages
R is `GNU S' - A language and environment for statistical computing
......
......@@ -26,4 +26,31 @@ r-base-core: lengthy-symlink usr/share/R/doc/COPYING.LIB ../../../share/common-l
r-base-core: script-not-executable ./usr/lib/R/share/perl/build-help.pl
r-base-core: menu-item-creates-new-root-section Applications /usr/share/menu/r-base-core:5
r-base-core: pkg-has-shlibs-control-file-but-no-actual-shared-libs
r-base-core: extra-license-file usr/share/R/share/licenses/license.db
\ No newline at end of file
r-base-core: extra-license-file usr/share/R/share/licenses/license.db
r-base-core: package-contains-empty-directory usr/lib/R/library/graphics/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/base/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/tools/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/methods/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/splines/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/tcltk/html/
r-base-core: package-contains-empty-directory usr/share/info/
r-base-core: package-contains-empty-directory usr/share/R/doc/manual/
r-base-core: package-contains-empty-directory usr/lib/R/library/grid/latex/
r-base-core: package-contains-empty-directory usr/lib/R/site-library/
r-base-core: package-contains-empty-directory usr/lib/R/library/graphics/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/stats/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/stats4/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/stats/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/grDevices/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/utils/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/datasets/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/datasets/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/grDevices/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/tcltk/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/methods/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/splines/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/base/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/stats4/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/grid/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/tools/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/utils/html/
......@@ -4,3 +4,5 @@ r-recommended: extra-license-file usr/lib/R/library/nnet/LICENCE
r-recommended: extra-license-file usr/lib/R/library/spatial/LICENCE
r-recommended: extra-license-file usr/lib/R/library/nlme/COPYING
r-recommended: extra-license-file usr/lib/R/library/survival/COPYING
r-recommended: package-contains-empty-directory usr/lib/R/library/
r-recommended: package-contains-empty-directory usr/share/lintian/overrides/
......@@ -559,8 +559,8 @@ binary-arch: build-arch check install-arch
# install lintian "silencer"
install -p -m 0644 debian/$(corepackage).lintian \
$(debbase)/$(corepackage)/usr/share/lintian/overrides/$(corepackage)
# install -p -m 0644 debian/$(recdpackage).lintian \
# $(debbase)/$(recdpackage)/usr/share/lintian/overrides/$(recdpackage)
install -p -m 0644 debian/$(recdpackage).lintian \
$(debbase)/$(recdpackage)/usr/share/lintian/overrides/$(recdpackage)
install -p -m 0644 debian/$(nmathpackage).lintian \
$(debbase)/$(nmathpackage)/usr/share/lintian/overrides/$(nmathpackage)
#dh_undocumented -a
......
......@@ -166,6 +166,8 @@ edit.matrix <-
else names(datalist) <- paste("col", 1:ncol(name), sep = "")
modes <- as.list(rep.int(mode(name), ncol(name)))
if (edit.row.names) {
if (is.null(dn[[1]])) ## true if forced edit.row.names as TRUE on null
dn[[1]] <- paste("row", 1:dim(name)[1], sep="")
datalist <- c(list(row.names = dn[[1]]), datalist)
modes <- c(list(row.names = "character"), modes)
}
......
This diff is collapsed.
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