Commit 9500ebb3 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.2.1-3

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

  * Re-wrote parts of debian/* to take advantage of recent upstream changes
    permitting installation of (most) files outside of /usr/lib/R;
  * debian/rules: Use configure options 
      --datadir=/usr/share/R/share and 
      --includedir=/usr/share/R/include
    as well as 'make install' targets
      rsharedir, rincludedir, and rdocdir
  * debian/r-{base-html.{files,dirs}, doc-pdf.{files,links},
    doc-html.{file,links}}:
    updated accordingly to refer to /usr/share/R/* instead of /usr/lib/R
  * For R itself (but not for packages), architecture-independent files 
    of r-base-core now install below /usr/share/R 	(Closes: #300765)
  
  * debian/control: Added Build-Depends: for libx11-dev, libxt-dev, x-dev
    (though the existing Build-Depends on tcl/tk effectively cover this).
    Credits for the suggestion go to the xlibs-split-check script .
parent 5fdd48f8
r-base (2.2.1-3) unstable; urgency=low
* Re-wrote parts of debian/* to take advantage of recent upstream changes
permitting installation of (most) files outside of /usr/lib/R;
* debian/rules: Use configure options
--datadir=/usr/share/R/share and
--includedir=/usr/share/R/include
as well as 'make install' targets
rsharedir, rincludedir, and rdocdir
* debian/r-{base-html.{files,dirs}, doc-pdf.{files,links},
doc-html.{file,links}}:
updated accordingly to refer to /usr/share/R/* instead of /usr/lib/R
* For R itself (but not for packages), architecture-independent files
of r-base-core now install below /usr/share/R (Closes: #300765)
* debian/control: Added Build-Depends: for libx11-dev, libxt-dev, x-dev
(though the existing Build-Depends on tcl/tk effectively cover this).
Credits for the suggestion go to the xlibs-split-check script .
-- Dirk Eddelbuettel <edd@debian.org> Sat, 21 Jan 2006 18:14:37 -0600
r-base (2.2.1-2) unstable; urgency=low
* debian/control: Remove Build-Depends: on libpaperg-dev as we do not
......@@ -1262,12 +1283,12 @@ r-base (0.63.0-1) unstable; urgency=low
-- Douglas Bates <bates@stat.wisc.edu> Wed, 18 Nov 1998 13:33:58 -0600
r-base (0.62.4-1) frozen unstable; urgency=low, closes=26444
r-base (0.62.4-1) frozen unstable; urgency=low
* New upstream release
* Fixed link to html directory in /usr/doc (Bug#26444)
* Check for /usr/bin/paperconf in postinst and set default R_PAPERSIZE (Bug#26447)
* Remove src/lib directory in debian/rules clean (Bug#28545)
* Fixed link to html directory in /usr/doc (Closes: Bug#26444)
* Check for /usr/bin/paperconf in postinst and set default R_PAPERSIZE (Closes: #26447)
* Remove src/lib directory in debian/rules clean (Closes: #28545)
-- Douglas Bates <bates@stat.wisc.edu> Mon, 2 Nov 1998 09:29:20 -0600
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Uploaders: Douglas Bates <bates@stat.wisc.edu>
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
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, libx11-dev, libxt-dev, x-dev
Package: r-base
Architecture: all
......
......@@ -5,4 +5,6 @@ usr/lib/R
usr/lib/R/site-library
usr/share/doc/r-base-core
usr/share/lintian/overrides
usr/share/R/include/
usr/share/R/share/
usr/share/texmf/tex/latex
......@@ -6,8 +6,8 @@ r-base-core: file-missing-in-md5sums usr/lib/R/library/base/html/function.html
r-base-core: file-missing-in-md5sums usr/lib/R/library/base/html/is.function.html
r-base-core: file-missing-in-md5sums usr/lib/R/library/base/html/remove.packages.html
r-base-core: file-missing-in-md5sums usr/lib/R/doc/html/function.html
r-base-core: file-missing-in-md5sums usr/lib/R/doc/html/packages.html
r-base-core: file-missing-in-md5sums usr/lib/R/doc/html/search/index.txt
r-base-core: file-missing-in-md5sums usr/share/R/doc/html/packages.html
r-base-core: file-missing-in-md5sums usr/share/R/doc/html/search/index.txt
r-base-core: file-missing-in-md5sums usr/lib/R/library/base/html/as.function.html
r-base-core: file-missing-in-md5sums usr/bin/R
r-base-core: file-missing-in-md5sums usr/lib/R/library/base/html/update.packages.html
......
......@@ -29,7 +29,7 @@ case "$1" in
#echo "Papersize in Renviron is $rpaper"
if [ "$syspaper" != "$rpaper" ]
then
echo "Changing R_PAPERSIZE from $rpaper with $syspaper"
echo "Changing R_PAPERSIZE from $rpaper to $syspaper"
perl -p -i -e "s|\'$rpaper\'|\'$syspaper\'|" "$Rfile"
fi
fi
......
usr/lib/R/library/*/html
usr/lib/R/library/*/html/
usr/lib/R/doc/manual/*.html
usr/share/R/doc/manual/*.html
usr/lib/R/doc/manual/R-FAQ.html usr/share/doc/r-doc-html/manual/R-FAQ.html
usr/lib/R/doc/manual/R-admin.html usr/share/doc/r-doc-html/manual/R-admin.html
usr/lib/R/doc/manual/R-data.html usr/share/doc/r-doc-html/manual/R-data.html
usr/lib/R/doc/manual/R-exts.html usr/share/doc/r-doc-html/manual/R-exts.html
usr/lib/R/doc/manual/R-intro.html usr/share/doc/r-doc-html/manual/R-intro.html
usr/lib/R/doc/manual/R-lang.html usr/share/doc/r-doc-html/manual/R-lang.html
usr/share/R/doc/manual/R-FAQ.html usr/share/doc/r-doc-html/manual/R-FAQ.html
usr/share/R/doc/manual/R-admin.html usr/share/doc/r-doc-html/manual/R-admin.html
usr/share/R/doc/manual/R-data.html usr/share/doc/r-doc-html/manual/R-data.html
usr/share/R/doc/manual/R-exts.html usr/share/doc/r-doc-html/manual/R-exts.html
usr/share/R/doc/manual/R-intro.html usr/share/doc/r-doc-html/manual/R-intro.html
usr/share/R/doc/manual/R-lang.html usr/share/doc/r-doc-html/manual/R-lang.html
usr/lib/R/doc/manual/*.pdf
usr/share/R/doc/manual/*.pdf
usr/lib/R/doc/manual/R-FAQ.pdf usr/share/doc/r-doc-pdf/manual/R-FAQ.pdf
usr/lib/R/doc/manual/R-admin.pdf usr/share/doc/r-doc-pdf/manual/R-admin.pdf
usr/lib/R/doc/manual/R-data.pdf usr/share/doc/r-doc-pdf/manual/R-data.pdf
usr/lib/R/doc/manual/R-exts.pdf usr/share/doc/r-doc-pdf/manual/R-exts.pdf
usr/lib/R/doc/manual/R-intro.pdf usr/share/doc/r-doc-pdf/manual/R-intro.pdf
usr/lib/R/doc/manual/R-lang.pdf usr/share/doc/r-doc-pdf/manual/R-lang.pdf
usr/lib/R/doc/manual/refman.pdf usr/share/doc/r-doc-pdf/manual/refman.pdf
usr/share/R/doc/manual/R-FAQ.pdf usr/share/doc/r-doc-pdf/manual/R-FAQ.pdf
usr/share/R/doc/manual/R-admin.pdf usr/share/doc/r-doc-pdf/manual/R-admin.pdf
usr/share/R/doc/manual/R-data.pdf usr/share/doc/r-doc-pdf/manual/R-data.pdf
usr/share/R/doc/manual/R-exts.pdf usr/share/doc/r-doc-pdf/manual/R-exts.pdf
usr/share/R/doc/manual/R-intro.pdf usr/share/doc/r-doc-pdf/manual/R-intro.pdf
usr/share/R/doc/manual/R-lang.pdf usr/share/doc/r-doc-pdf/manual/R-lang.pdf
usr/share/R/doc/manual/refman.pdf usr/share/doc/r-doc-pdf/manual/refman.pdf
......@@ -181,6 +181,8 @@ configure-stamp:
--with-system-zlib \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share/R/share \
--includedir=/usr/share/R/include \
$(atlas) \
$(lapack) \
$(gnomeconfig) \
......@@ -291,19 +293,24 @@ install-arch-stamp:
dh_clean -a -k
dh_installdirs -A
$(MAKE) prefix=$(debtmp)/usr \
mandir=$(debtmp)/usr/share/man install
$(MAKE) prefix=$(debtmp)/usr \
mandir=$(debtmp)/usr/share/man \
rsharedir=$(debtmp)/usr/share/R/share \
rincludedir=$(debtmp)/usr/share/R/include \
rdocdir=$(debtmp)/usr/share/R/doc \
install
# link $R_HOME/bin/R to real one, and set R_HOME_DIR env.var.
# edd 05 Sep 2005 expand this to R_SHARE_DIR, R_INCLUDE_DIR, R_DOC_DIR
# edd 05 Sep 2005 expand this to R_SHARE_DIR, R_INCLUDE_DIR, R_DOC_DIR
# edd 15 Jan 2006 now let those three point to /usr/share/R
(cd $(debtmp)/usr/lib/R/bin/; \
ln -svf ../../../bin/R R; \
cd ../../../bin; \
perl -p -i -e \
's|^R_HOME_DIR=.*|R_HOME_DIR=/usr/lib/R|;\
s|^R_SHARE_DIR=.*|R_SHARE_DIR=/usr/lib/R/share|;\
s|^R_INCLUDE_DIR=.*|R_INCLUDE_DIR=/usr/lib/R/include|;\
s|^R_DOC_DIR=.*|R_DOC_DIR=/usr/lib/R/doc|' R)
s|^R_SHARE_DIR=.*|R_SHARE_DIR=/usr/share/R/share|;\
s|^R_INCLUDE_DIR=.*|R_INCLUDE_DIR=/usr/share/R/include|;\
s|^R_DOC_DIR=.*|R_DOC_DIR=/usr/share/R/doc|' R)
# set browser to mozilla as mozilla-1.0.0 works with help.start()
# (we're now using /usr/bin/sensible-browser, see above)
......@@ -313,9 +320,10 @@ install-arch-stamp:
# Renviron)
# fix permissions (Lintian)
chmod a+x $(debtmp)/usr/lib/R/share/sh/echo.sh \
$(debtmp)/usr/lib/R/share/sh/help-links.sh \
$(debtmp)/usr/lib/R/share/sh/help-print.sh
# edd 15 Jan 2006 now under /usr/share/R
chmod a+x $(debtmp)/usr/share/R/share/sh/echo.sh \
$(debtmp)/usr/share/R/share/sh/help-links.sh \
$(debtmp)/usr/share/R/share/sh/help-print.sh
# remove unneeded license files, but link them back
rm -v $(debtmp)/usr/lib/R/COPYING \
......@@ -360,7 +368,9 @@ install-arch-stamp:
# move files for r-base-latex
dh_movefiles --sourcedir=debian/$(corepackage) -pr-base-latex
make prefix=$(debtmp)/usr install-pdf
make prefix=$(debtmp)/usr \
rdocdir=$(debtmp)/usr/share/R/doc \
install-pdf
# the indep package r-doc-info is made now
make prefix=$(debtmp)/usr \
......@@ -419,7 +429,7 @@ install-arch-stamp:
# cat $(debbase)/Renviron-R_PAPERSIZE.patch | patch --verbose;
# deal with build.help.pl's --htmllists argument
(cd $(debtmp)/usr/lib/R/share/perl; \
(cd $(debtmp)/usr/share/R/share/perl; \
cat $(debbase)/build-help.pl.patch | patch --verbose )
# add tab completion by Deepayan
......
......@@ -17,7 +17,7 @@ export R_DOC_DIR
## NOTE:
## We must set this here rather than in the main binary.
: ${R_LD_LIBRARY_PATH=${R_HOME}/lib:@R_LD_LIBRARY_PATH@}
: ${R_LD_LIBRARY_PATH=${R_HOME}/lib}
if test -z "${@shlibpath_var@}"; then
@shlibpath_var@="${R_LD_LIBRARY_PATH}"
else
......
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