Commit efeceb49 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.7.1-1

r-base (2.7.1-1) unstable; urgency=low

  * New upstream version released a few hours ago

r-base (2.7.1~20080621-1) unstable; urgency=low

  * New 'rc' release of R 2.7.1 expected to be released on June 23
  
  * debian/{rules,r-base-core.postinst}: Changed to have /etc/R/Renviron
    be handled by ucf, with thanks to Aaron M. Ucko	(Closes: #476420)
  * debian/control: Added Depends: on ucf to r-base-core
  
  * debian/control: Build-Depends updated from 'x-dev, xbase-clients' to
    'x11proto-core-dev, xauth'

r-base (2.7.1~20080614-1) unstable; urgency=low

  * Initial 'beta' release of R 2.7.1 expected to be released on June 23

  * debian/control: Added Homepage: field as suggested by Andreas Tille
							(Closes: #481058)
parents 0bf32f2e afc4307d
......@@ -22,7 +22,7 @@ CFLAGS = @CFLAGS@
CPICFLAGS = @CPICFLAGS@
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@ @R_DEFS@
DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=CVS --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)"
DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=CVS --exclude=Makefile --exclude="*~" --exclude="*.o" --exclude="*$(SHLIB_EXT)"
DVIPS = @DVIPS@
DYLIB_EXT = @DYLIB_EXT@
DYLIB_LD = @DYLIB_LD@
......
......@@ -99,7 +99,7 @@ svnonly:
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
(cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || $(ECHO) "Revision: unknown") 2> /dev/null \
(cd $(srcdir); LC_ALL=C TZ=GMT svn -rHEAD info || $(ECHO) "Revision: unknown") 2> /dev/null \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
| cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
$(top_srcdir)/tools/move-if-change SVN-REVISION-tmp SVN-REVISION ; \
......
This diff is collapsed.
Revision: 45424
Last Changed Date: 2008-04-22
Revision: 45970
Last Changed Date: 2008-06-23
This diff is collapsed.
r-base (2.7.1-1) unstable; urgency=low
* New upstream version released a few hours ago
-- Dirk Eddelbuettel <edd@debian.org> Mon, 23 Jun 2008 06:10:26 -0500
r-base (2.7.1~20080621-1) unstable; urgency=low
* New 'rc' release of R 2.7.1 expected to be released on June 23
* debian/{rules,r-base-core.postinst}: Changed to have /etc/R/Renviron
be handled by ucf, with thanks to Aaron M. Ucko (Closes: #476420)
* debian/control: Added Depends: on ucf to r-base-core
* debian/control: Build-Depends updated from 'x-dev, xbase-clients' to
'x11proto-core-dev, xauth'
-- Dirk Eddelbuettel <edd@debian.org> Sat, 21 Jun 2008 11:26:48 -0500
r-base (2.7.1~20080614-1) unstable; urgency=low
* Initial 'beta' release of R 2.7.1 expected to be released on June 23
* debian/control: Added Homepage: field as suggested by Andreas Tille
(Closes: #481058)
-- Dirk Eddelbuettel <edd@debian.org> Sat, 14 Jun 2008 11:45:22 -0500
r-base (2.7.0-1) unstable; urgency=low
* New upstream version released a few hours ago
......
......@@ -2,9 +2,9 @@ Source: r-base
Section: math
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Uploaders: Douglas Bates <bates@stat.wisc.edu>
Standards-Version: 3.7.3
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, x-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xbase-clients, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html
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
Homepage: http://www.r-project.org/
Package: r-base
Architecture: all
......@@ -27,7 +27,7 @@ Description: GNU R statistical computing language and environment
.
S is the statistician's Matlab and R is to S what Octave is to Matlab.
.
This package is a meta-package which eases the transition from the
This package is a metapackage which eases the transition from the
pre-1.5.0 package setup with its larger r-base package. Once installed, it
can be safely removed and apt-get will automatically upgrade its components
during future upgrades. Providing this packages gives a way to users to
......@@ -35,7 +35,7 @@ Description: GNU R statistical computing language and environment
Package: r-base-core
Architecture: any
Depends: ${perl:Depends}, zip, unzip, libpaper-utils, ${shlibs:Depends}
Depends: ${perl:Depends}, zip, unzip, libpaper-utils, ${shlibs:Depends}, ucf
Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0), r-gnome (<= 2.3.1), r-cran-rcompgen (<= 0.1-17-1)
Provides: r-gnome, r-cran-rcompgen
Conflicts: r-gnome, r-cran-rcompgen
......
This diff is collapsed.
......@@ -14,11 +14,13 @@ case "$1" in
# edd 19 June 2004 deal with papersize
# edd 22 June 2004 make that conditional on paperconf
# edd 25 Oct 2006 rewritten for R 2.4.0 and R_PAPERSIZE_USER
# edd 21 Jun 2008 rewritten for R 2.7.1 and ucf input
if [ -x /usr/bin/paperconf ]; then
## get the value we want from Debian's paperconf utility
papersize=`/usr/bin/paperconf`
## this is the file we need to set it in
Renviron=/etc/R/Renviron
#Renviron=/etc/R/Renviron
Renviron=/usr/lib/R/etc/Renviron.ucf
if [ -f $Renviron ]; then
## test if the file is unmodified `as shipped'
if grep -q -E "^R_PAPERSIZE_USER=\\$\{R_PAPERSIZE\}" $Renviron; then
......@@ -30,6 +32,12 @@ case "$1" in
fi
fi
fi
# edd 21 Jun 2008 whether or not Renviron was modified, ucf will handle it,
# so tell ucf that file Renviron.ucf is the source for
# conffile in /etc and register it
ucf /usr/lib/R/etc/Renviron.ucf /etc/R/Renviron
ucfr r-base-core /etc/R/Renviron
#
if [ -x /usr/bin/update-menus ]; then
update-menus
fi
......
......@@ -455,10 +455,12 @@ install-arch-stamp:
# edd 16 Jun 2004 nope, doesn't work
# edd 09 Apr 2005 also move the new file repositories to /etc/R
# 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
(cd $(debetc); \
cat $(debbase)/Renviron-R_LIBS.patch | patch --verbose; \
mv Makeconf Renviron repositories ldpaths \
../../../../etc/R/; \
mv Makeconf repositories ldpaths ../../../../etc/R/; \
mv Renviron Renviron.ucf; \
ln -s /etc/R/Makeconf .; \
ln -s /etc/R/Renviron .; \
ln -s /etc/R/ldpaths .; \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -971,7 +971,7 @@ and @code{NaN} values. To differentiate these, @code{is.nan(xx)} is only
@code{TRUE} for @code{NaN}s.
@findex is.nan
Missing values are sometimes printed as @code{<NA>}, when character
Missing values are sometimes printed as @code{<NA>} when character
vectors are printed without quotes.
@node Character vectors, Index vectors, Missing values, Simple manipulations numbers and vectors
......@@ -983,13 +983,13 @@ for example as plot labels. Where needed they are denoted by a sequence
of characters delimited by the double quote character, e.g.,
@code{"x-values"}, @code{"New iteration results"}.
Character strings are entered using either double (@code{"}) or single
(@code{'}) quotes, but are printed using double quotes (or sometimes
without quotes). They use C-style escape sequences, using @code{\} as
the escape character, so @code{\\} is entered and printed as @code{\\},
and inside double quotes @code{"} is entered as @code{\"}. Other
useful escape sequences are @code{\n}, newline, @code{\t}, tab and
@code{\b}, backspace.
Character strings are entered using either matching double (@code{"}) or
single (@code{'}) quotes, but are printed using double quotes (or
sometimes without quotes). They use C-style escape sequences, using
@code{\} as the escape character, so @code{\\} is entered and printed as
@code{\\}, and inside double quotes @code{"} is entered as @code{\"}.
Other useful escape sequences are @code{\n}, newline, @code{\t}, tab and
@code{\b}, backspace---see @command{?Quotes} for a full list.
Character vectors may be concatenated into a vector by the @code{c()}
function; examples of their use will emerge frequently.
......
This diff is collapsed.
......@@ -4370,7 +4370,7 @@ string and vice versa.
Currently the inclusion of @code{\0} in a string constant terminates the
constant: further characters up to the closing quote are scanned but
ignored. (This will change in @R{} 2.8.0.)
ignored. (This will give a warning in @R{} 2.8.0.)
@node Identifiers, Reserved words, Literal constants, Tokens
@subsection Identifiers
......
......@@ -2215,8 +2215,7 @@ if test -z "${TCLTK_CPPFLAGS}"; then
CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC}"
AC_CHECK_HEADER([tcl.h],
[TCLTK_CPPFLAGS="${TCL_INCLUDE_SPEC}"
found_tcl_h=yes
break])
found_tcl_h=yes])
CPPFLAGS="${r_save_CPPFLAGS}"
fi
if test "${found_tcl_h}" = no; then
......@@ -2260,8 +2259,7 @@ if test -z "${TCLTK_CPPFLAGS}"; then
CPPFLAGS="${CPPFLAGS} ${TCLTK_CPPFLAGS} ${TK_XINCLUDES} ${TK_INCLUDE_SPEC}"
AC_CHECK_HEADER([tk.h],
[TCLTK_CPPFLAGS="${TCLTK_CPPFLAGS} ${TK_INCLUDE_SPEC}"
found_tk_h=yes
break])
found_tk_h=yes])
CPPFLAGS="${r_save_CPPFLAGS}"
fi
if test "${found_tk_h}" = no; then
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -209,6 +209,7 @@ char *askfilenames(const char *title, const char *default_name, int multi,
int i;
OPENFILENAME ofn;
char cwd[MAX_PATH] = "";
HWND prev = GetFocus();
if (!default_name) default_name = "";
strcpy(strbuf, default_name);
......@@ -245,13 +246,13 @@ char *askfilenames(const char *title, const char *default_name, int multi,
SetCurrentDirectory(cwd);
strbuf[0] = 0;
strbuf[1] = 0;
return strbuf;
} else {
GetCurrentDirectory(MAX_PATH, cod);
SetCurrentDirectory(cwd);
for (i = 0; i < 10; i++) if (peekevent()) doevent();
return strbuf;
}
SetFocus(prev);
return strbuf;
}
int countFilenames(const char *list)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.