Commit 2714c98c authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.3.1-2

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

  * debian/control: Removed obsolete and deprecated r-gnome entry
  * debian/control: Added Conflicts:, Replaces: and Provides: for 
    'r-gnome (<= 2.3.1)' to r-base-core to finally replace r-gnome

  * debian/r-doc-html.preinst: Added file with test for symlink
    /usr/share/doc/r-doc-html/manual/ which may be left over from
    a previous installation and needs to be removed for a clean
    current installation			(Closes: #376940)

  * debian/rules: Correct softlink for /usr/share/doc/r-base-core/doc 
    into /usr/share/R/doc			(Closes: #380126)
parent 0bf131f5
r-base (2.3.1-2) unstable; urgency=low
* debian/control: Removed obsolete and deprecated r-gnome entry
* debian/control: Added Conflicts:, Replaces: and Provides: for
'r-gnome (<= 2.3.1)' to r-base-core to finally replace r-gnome
* debian/r-doc-html.preinst: Added file with test for symlink
/usr/share/doc/r-doc-html/manual/ which may be left over from
a previous installation and needs to be removed for a clean
current installation (Closes: #376940)
* debian/rules: Correct softlink for /usr/share/doc/r-base-core/doc
into /usr/share/R/doc (Closes: #380126)
-- Dirk Eddelbuettel <edd@debian.org> Fri, 28 Jul 2006 19:52:13 -0500
r-base (2.3.1-1) unstable; urgency=low r-base (2.3.1-1) unstable; urgency=low
* New upstream release released this morning * New upstream release released this morning
......
...@@ -36,7 +36,8 @@ Description: GNU R statistical computing language and environment ...@@ -36,7 +36,8 @@ Description: GNU R statistical computing language and environment
Package: r-base-core Package: r-base-core
Architecture: any Architecture: any
Depends: ${perl:Depends}, zlib-bin, libpaper-utils, ${shlibs:Depends} Depends: ${perl:Depends}, zlib-bin, libpaper-utils, ${shlibs:Depends}
Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0) Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0), r-gnome (<= 2.3.1)
Provides: r-gnome
Recommends: r-recommended, r-base-dev Recommends: r-recommended, r-base-dev
Suggests: 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 Description: GNU R core of statistical computing language and environment
...@@ -60,32 +61,6 @@ Description: GNU R core of statistical computing language and environment ...@@ -60,32 +61,6 @@ Description: GNU R core of statistical computing language and environment
and r-doc-info have been split off to somewhat reduce the size of this and r-doc-info have been split off to somewhat reduce the size of this
package. package.
Package: r-gnome
Section: gnome
Architecture: all
Depends: r-base-core
Recommends: r-cran-gtkdevice
Description: GNU R Gnome gui for statistical computing system
R is `GNU S' - A language and environment for statistical computing
and graphics. R is similar to the award-winning S system, which was
developed at Bell Laboratories by John Chambers et al. It provides a
wide variety of statistical and graphical techniques (linear and
nonlinear modelling, statistical tests, time series analysis,
classification, clustering, ...).
.
R is designed as a true computer language with control-flow
constructions for iteration and alternation, and it allows users to
add additional functionality by defining new functions. For
computationally intensive tasks, C, C++ and Fortran code can be
linked and called at run time.
.
This package used to provide the dynamic link libraries needed to start
GNU R with the GNOME libraries frontend as in "R --gui=GNOME".
.
As of R 2.1.0, this interface is no longer provided with the upstream
sources. As such, this package is now an empty stub that will be removed
in a subsequent revision of the Debian package.
Package: r-base-dev Package: r-base-dev
Architecture: all Architecture: all
Section: devel Section: devel
......
...@@ -12,9 +12,15 @@ case "$1" in ...@@ -12,9 +12,15 @@ case "$1" in
# edd 06 Feb 2006 2.2.1-4 created this symlink, we now want a directory # edd 06 Feb 2006 2.2.1-4 created this symlink, we now want a directory
if [ -h /usr/lib/R/share ] if [ -h /usr/lib/R/share ]
then then
echo "Remving symbolic link /usr/lib/R/share" echo "Removing symbolic link /usr/lib/R/share"
rm /usr/lib/R/share rm /usr/lib/R/share
fi fi
# edd 27 Jul 2006 this is now a softlink but used to be a dir
dir=/usr/share/doc/r-base-core/doc
if [ -d $dir ] && [ ! -h $dir ]
then
rmdir $dir
fi
;; ;;
abort-upgrade) abort-upgrade)
......
#!/bin/sh
#
# preinst script for the Debian GNU/Linux r-doc-html package
# This version written by Dirk Eddelbuettel <edd@debian.org>
set -e
#DEBHELPER#
case "$1" in
install|upgrade)
# edd 05 Jul 2006 from with the /usr/lib -> /usr/share transition
directory=
if [ -h /usr/share/doc/r-doc-html/manual ]
then
echo "Removing symbolic link /usr/share/doc/r-doc-html/manual/"
rm /usr/share/doc/r-doc-html/manual/
fi
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
;;
esac
exit 0
...@@ -563,7 +563,8 @@ binary-arch: build-arch check install-arch ...@@ -563,7 +563,8 @@ binary-arch: build-arch check install-arch
##(cd $(debdoc)/doc && ln -s ../../../../lib/R/doc/html .) ##(cd $(debdoc)/doc && ln -s ../../../../lib/R/doc/html .)
##(cd $(debdoc)/doc && ln -s ../../../../lib/R/doc/manual .) ##(cd $(debdoc)/doc && ln -s ../../../../lib/R/doc/manual .)
# ... so install doc as a link, as we already did with library # ... so install doc as a link, as we already did with library
(cd $(debdoc) && ln -s ../../../lib/R/doc .) # (cd $(debdoc) && ln -s ../../../lib/R/doc .)
(cd $(debdoc) && ln -s ../../R/doc .)
(cd $(debdoc) && ln -s ../../../lib/R/library .) (cd $(debdoc) && ln -s ../../../lib/R/library .)
# install lintian "silencer" # install lintian "silencer"
install -p -m 0644 debian/$(corepackage).lintian \ install -p -m 0644 debian/$(corepackage).lintian \
......
Package: r-gnome
Section: gnome
Architecture: all
Depends: r-base-core
Recommends: r-cran-gtkdevice
Description: GNU R Gnome gui for statistical computing system
R is `GNU S' - A language and environment for statistical computing
and graphics. R is similar to the award-winning S system, which was
developed at Bell Laboratories by John Chambers et al. It provides a
wide variety of statistical and graphical techniques (linear and
nonlinear modelling, statistical tests, time series analysis,
classification, clustering, ...).
.
R is designed as a true computer language with control-flow
constructions for iteration and alternation, and it allows users to
add additional functionality by defining new functions. For
computationally intensive tasks, C, C++ and Fortran code can be
linked and called at run time.
.
This package used to provide the dynamic link libraries needed to start
GNU R with the GNOME libraries frontend as in "R --gui=GNOME".
.
As of R 2.1.0, this interface is no longer provided with the upstream
sources. As such, this package is now an empty stub that will be removed
in a subsequent revision of the Debian package.
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