Commit 5fdd48f8 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.2.1-2

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

  * debian/control: Remove Build-Depends: on libpaperg-dev as we do not
    actually build against libpaper anyway 		(Closes: #346403)
  * debian/control: Add Depends: on libpaper-utils to r-base-core, 
    and remove different Suggests: of libpaperg

  * debian/control: Update Standards-Version: to 3.6.2
  * debian/control: Change Architecture: any for empty r-recommended
parent 51e699d4
--- Renviron.orig 2004-04-24 14:15:26.000000000 -0500
+++ Renviron 2004-04-24 14:18:51.000000000 -0500
--- Renviron.orig 2005-09-08 23:00:58.000000000 -0500
+++ Renviron 2006-01-07 11:31:07.000000000 -0600
@@ -6,7 +6,8 @@
R_PLATFORM=${R_PLATFORM-'i386-pc-linux-gnu'}
R_PLATFORM=${R_PLATFORM-'i486-pc-linux-gnu'}
## Default printer paper size
-R_PAPERSIZE=${R_PAPERSIZE-'letter'}
+## edd Apr 2004: use Debian's paperconf settings, with thanks to Matej Cepl
+R_PAPERSIZE=${R_PAPERSIZE-$(cat /etc/papersize)}
+## edd 07 Jan 2006 try determining this at start-time based on paperconf
+R_PAPERSIZE=${R_PAPERSIZE-`paperconf`}
## Default print command
R_PRINTCMD=${R_PRINTCMD-'/usr/bin/lpr'}
## Default TeXMF stuff
r-base (2.2.1-2) unstable; urgency=low
* debian/control: Remove Build-Depends: on libpaperg-dev as we do not
actually build against libpaper anyway (Closes: #346403)
* debian/control: Add Depends: on libpaper-utils to r-base-core,
and remove different Suggests: of libpaperg
* debian/control: Update Standards-Version: to 3.6.2
* debian/control: Change Architecture: any for empty r-recommended
-- Dirk Eddelbuettel <edd@debian.org> Sat, 7 Jan 2006 20:18:06 -0600
r-base (2.2.1-1) unstable; urgency=low
* New upstream version 2.2.1 released this morning
......
......@@ -3,14 +3,14 @@ Section: math
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Uploaders: Douglas Bates <bates@stat.wisc.edu>
Standards-Version: 3.6.1.1
Build-Depends: refblas3-dev | atlas3-base-dev, tcl8.4-dev, tk8.4-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 3.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, libpaperg-dev, tetex-bin, tetex-extra, xpdf-reader, libpaper-utils, zlib1g-dev, libpng12-dev, libjpeg62-dev
Standards-Version: 3.6.2
Build-Depends: refblas3-dev | atlas3-base-dev, tcl8.4-dev, tk8.4-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 3.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, tetex-bin, tetex-extra, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev
Package: r-base
Architecture: all
Depends: r-base-core (= ${Source-Version}), r-recommended (= ${Source-Version})
Recommends: r-base-html, r-base-latex
Suggests: libpaperg, ess, r-doc-info | r-doc-pdf | r-doc-html, libpaper-utils
Suggests: ess, r-doc-info | r-doc-pdf | r-doc-html
Description: GNU R statistical computing language and environment
R is `GNU S' - A language and environment for statistical computing
and graphics. R is similar to the award-winning S system, which was
......@@ -35,10 +35,10 @@ Description: GNU R statistical computing language and environment
Package: r-base-core
Architecture: any
Depends: ${perl:Depends}, zlib-bin, ${shlibs:Depends}
Depends: ${perl:Depends}, zlib-bin, libpaper-utils, ${shlibs:Depends}
Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0)
Recommends: r-recommended, r-base-dev
Suggests: libpaperg, ess, r-doc-info | r-doc-pdf | r-doc-html, r-mathlib, r-base-html | r-base-latex
Suggests: ess, r-doc-info | r-doc-pdf | r-doc-html, r-mathlib, r-base-html | r-base-latex
Description: GNU R core of statistical computing language and environment
R is `GNU S' - A language and environment for statistical computing
and graphics. R is similar to the award-winning S system, which was
......@@ -242,7 +242,7 @@ Description: GNU R info manuals statistical computing system
r-doc-html and r-doc-pdf provide the same manuals.
Package: r-recommended
Architecture: all
Architecture: any
Depends: r-base-core (= ${Source-Version}), r-cran-boot (>= 1.2.19), r-cran-cluster (>= 1.9.6-2), r-cran-foreign (>= 0.7-2), r-cran-kernsmooth (>= 2.2.14), r-cran-lattice (>= 0.10.11), r-cran-mgcv (>= 1.1.5), r-cran-nlme (>= 3.1.52), r-cran-rpart (>= 3.1.20), r-cran-survival (>= 2.13.2-1), r-cran-vr (>= 7.2.8)
Description: GNU R collection of recommended packages [metapackage]
R is `GNU S' - A language and environment for statistical computing
......
......@@ -33,7 +33,6 @@ case "$1" in
perl -p -i -e "s|\'$rpaper\'|\'$syspaper\'|" "$Rfile"
fi
fi
if [ -x /usr/bin/update-menus ]
then
......
#!/usr/bin/make -f
# debian/rules file for the Debian GNU/Linux r-base package
# Copyright 1997-2005 by Douglas Bates <bates@stat.wisc.edu>
# Copyright 1997-2006 by Douglas Bates <bates@stat.wisc.edu>
# and Dirk Eddelbuettel <edd@debian.org>
# $Id: rules,v 1.56 2004/04/09 13:32:46 bates Exp $
corepackage = r-base-core
latexpackage = r-base-latex
pdfpackage = r-doc-pdf
......@@ -418,13 +416,13 @@ install-arch-stamp:
ln -s /etc/R/Makeconf .; \
ln -s /etc/R/Renviron .; \
ln -s /etc/R/repositories . )
## cat $(debbase)/Renviron-R_PAPERSIZE.patch | patch --verbose;
# cat $(debbase)/Renviron-R_PAPERSIZE.patch | patch --verbose;
# deal with build.help.pl's --htmllists argument
(cd $(debtmp)/usr/lib/R/share/perl; \
cat $(debbase)/build-help.pl.patch | patch --verbose )
# add tab completion by Deepayan
# add tab completion by Deepayan
install -m 0644 debian/R.bash_completion \
debian/$(corepackage)/etc/bash_completion.d/R
......
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