Commit e16e1423 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.3.0-1

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

  * New upstream version 2.3.0 released this morning

r-base (2.2.1.svn37779-1) unstable; urgency=low

  * Second beta release of the upcoming R 2.3.0 scheduled for April 24
  
  * src/main/version.c: Upstream fix for 'R --version' (Closes: #361968)

r-base (2.2.1.svn37715-1) unstable; urgency=low

  * First beta release of the upcoming R 2.3.0 scheduled for April 24
  
  * debian/rules: On ppc64, add -mminimal-toc to compiler flags
    Thanks to Andreas Jochens for the patch.  		(Closes: #361604)

r-base (2.2.1.svn37668-1) unstable; urgency=low

  * Second alpha release of the upcoming R 2.3.0 planned for April 24

  * configure{,.ac}: Upstream fix also selecting -fPIC on s390* which is
    less invasive than the rushed and uncoordinated binary NMU below. Please
    consider talking to the Debian maintainer, or R Core, before making 
    undifferianted wholsale changes to the build process. (Closes: #361219)

r-base (2.2.1.svn37642-1.1) unstable; urgency=low

  * Non-maintainer upload.
  * Always build with -fPIC. (closes: #361219) 

r-base (2.2.1.svn37642-1) unstable; urgency=low

  * First alpha release of the upcoming R 2.3.0 planned for April 24
  
  * debian/r-cran.mk: New file to be used as debian/rules for r-cran-*
  * debian/rules: Accomodate installation of cran.mk into r-base-dev
  
  * debian/control: Set gcc and gfortran Build-Depends: to version 4
  * debian/control: Likewise for Depends: of r-base-dev
  
  * debian/rules:  Add -std=gnu99 to C compiler flags, and split and
    slightly reorganize compiler flags and optimization options

  * debian/{r-base-core,r-mathlib}.lintian: Added a few entries
parents 17e7ba3f fe24ad41

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
......@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......
......@@ -32,8 +32,6 @@ ECHO_T = @ECHO_T@
FFLAGS = @FFLAGS@
FLIBS = @FLIBS@
FPICFLAGS = @FPICFLAGS@
F2C = @F2C@
F2CFLAGS = @F2CFLAGS@
F77 = @F77@
GETWD = @GETWD@
GZIP = --best
......@@ -42,11 +40,11 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DIR = ${INSTALL} -d
JAVAC = @JAVAC@
JAVA = @JAVA@
JAVA_HOME = @JAVA_HOME@
JAVA_PROG = @JAVA_PROG@
JAVA_LD_PATH = @JAVA_LD_PATH@
JAVA_LD_LIBRARY_PATH = @JAVA_LD_LIBRARY_PATH@
JAVA_LIBS = @JAVA_LIBS@
JAVAC = @JAVAC@
LATEX = @LATEX@
LDFLAGS = @LDFLAGS@
LIBM = @LIBM@
......@@ -59,11 +57,11 @@ MAIN_CFLAGS = @MAIN_CFLAGS@
MAIN_FFLAGS = @MAIN_FFLAGS@
MAIN_LD = @MAIN_LD@
MAIN_LDFLAGS = @MAIN_LDFLAGS@
@USE_LIBTOOL_FALSE@MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
@USE_LIBTOOL_TRUE@MAIN_LINK = $(LIBTOOL) --mode=link $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
MAKEINDEX = @MAKEINDEX@
MKINSTALLDIRS = $(SHELL) $(top_srcdir)/src/scripts/mkinstalldirs
PERL = @PERL@
R_ARCH = @R_ARCH@
R_FRAMEWORK_DIR = $(prefix)/R.framework
R_GZIPCMD = @R_GZIPCMD@
R_MODULES = @R_MODULES@
......@@ -83,8 +81,7 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_FFLAGS = @SHLIB_FFLAGS@
SHLIB_LD = @SHLIB_LD@
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
@USE_LIBTOOL_FALSE@SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS)
@USE_LIBTOOL_TRUE@SHLIB_LINK = $(LIBTOOL) --mode=link $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS)
SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS)
TAR = @TAR@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
......@@ -95,15 +92,15 @@ YACC = @YACC@
ALL_CFLAGS = $(R_XTRA_CFLAGS) $(MAIN_CFLAGS) $(CFLAGS)
ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS)
ALL_FFLAGS = $(R_XTRA_FFLAGS) $(MAIN_FFLAGS) $(FFLAGS)
ALL_CFLAGS_LO = $(R_XTRA_CFLAGS) $(CPICFLAGS) $(SHLIB_CFLAGS) $(CFLAGS)
ALL_FFLAGS_LO = $(R_XTRA_FFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
ALL_FFLAGS_LO = $(R_XTRA_CFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
.SUFFIXES:
.SUFFIXES: .c .f .d .lo .o
.SUFFIXES: .c .f .d .o
@r_cc_rules_frag@
@r_f77_rules_frag@
.f.o:
$(F77) $(ALL_FFLAGS) -c $< -o $@
prefix = @prefix@
exec_prefix = @exec_prefix@
......@@ -130,9 +127,10 @@ rdocdir = @rdocdir@
@WANT_R_FRAMEWORK_TRUE@mandir = $(rhome)
Rexecbindir = $(rhome)/bin
Rexeclibdir = $(rhome)/lib
Rexecbindir2 = $(rhome)/bin/exec$(R_ARCH)
Rexeclibdir = $(rhome)/lib$(R_ARCH)
## FIXME:
## Alternatively, we could try to set pkglibdir = $(rhome)/lib when
## switching to automake.
## </FIXME>
Rexecmodulesdir = $(rhome)/modules
Rexecmodulesdir = $(rhome)/modules$(R_ARCH)
......@@ -10,14 +10,14 @@ top_builddir = .
include $(top_builddir)/Makeconf
distdir = $(PACKAGE)-$(VERSION)
INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS NEWS THANKS
NON_SVN_INSTFILES = FAQ RESOURCES SVN-REVISION
INSTFILES = COPYING NEWS
NON_SVN_INSTFILES = SVN-REVISION
DISTFILES = $(INSTFILES) \
ChangeLog INSTALL ONEWS OONEWS README VERSION Y2K \
ChangeLog INSTALL ONEWS OONEWS README VERSION \
Makeconf.in Makefile.in \
config.site configure configure.ac
SUBDIRS = m4 tools doc etc share src tests @USE_NLS_TRUE@ po
SUBDIRS_WITH_NO_BUILD =
SUBDIRS_WITH_NO_BUILD = @USE_NLS_FALSE@ po
all: Makefile Makeconf R docs recommended
recommended: @USE_RECOMMENDED_PACKAGES_TRUE@ stamp-recommended
......@@ -32,7 +32,7 @@ ACINCLUDE_DEPENDENCIES = \
m4/R.m4 \
m4/clibs.m4 \
m4/codeset.m4 \
m4/gettext.m4 \
m4/gettext.m4 m4/gettext-lib.m4 \
m4/java.m4 \
m4/libtool.m4
CONFIGURE_DEPENDENCIES = $(srcdir)/VERSION
......@@ -81,6 +81,9 @@ install: installdirs svnonly
@for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)"; \
done
@for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} "$(rdocdir)"; \
done
@for f in $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $${f} "$(rhome)"; \
done
......@@ -93,9 +96,10 @@ install: installdirs svnonly
@WANT_R_FRAMEWORK_TRUE@ @(mv $(R_FRAMEWORK_DIR)/Resources/bin/RR $(R_FRAMEWORK_DIR)/Resources/bin/R)
@WANT_R_FRAMEWORK_TRUE@ @(chmod 755 $(R_FRAMEWORK_DIR)/Resources/bin/R)
@WANT_R_FRAMEWORK_TRUE@ @(cp $(R_FRAMEWORK_DIR)/Resources/bin/R $(R_FRAMEWORK_DIR)/Resources/R)
@WANT_R_FRAMEWORK_TRUE@ @(chmod -R g+w $(R_FRAMEWORK_DIR))
svnonly:
@if test ! -f "$(srcdir)/FAQ" || test -f non-tarball ; then \
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
(cd doc/manual && $(MAKE) front-matter) ; \
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \
......@@ -146,7 +150,7 @@ clean:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -f $(INSTFILES) $(NON_SVN_INSTFILES) ; \
rm -f $(INSTFILES); \
fi
distclean: clean
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
......@@ -220,12 +224,10 @@ reset-recommended:
@(cd src/library/Recommended && $(MAKE) clean)
install-R-framework:
@echo "Creating R framework ..."
@(cd "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)" && \
ln -f -s -n Resources/include Headers && \
ln -f -s -n Resources/lib/libR.dylib R && \
test -d "Resources/bin/Frameworks" || mkdir -p "Resources/bin/Frameworks" && \
cd Resources/bin/exec && \
ln -f -s -n ../Frameworks Frameworks)
ln -f -s -n Resources/lib/libR.dylib R)
@(cd "$(R_FRAMEWORK_DIR)/Versions" && \
ln -f -s -n $(FW_VERSION) Current)
@(cd "$(R_FRAMEWORK_DIR)" && \
......@@ -233,15 +235,41 @@ install-R-framework:
ln -f -s -n Versions/Current/Headers Headers&& \
ln -f -s -n Versions/Current/R R && \
ln -f -s -n Versions/Current/Resources Resources)
@## the resulting libR will point dyld to the fat libR regardless of its origin
@(cd "$(R_FRAMEWORK_DIR)/Resources/lib" && \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" ../lib/libR.dylib)
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" $(Rexeclibdir)/libR.dylib)
@(if test -e $(Rexeclibdir)/libRlapack.dylib; then \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change \
`otool -L $(Rexeclibdir)/libRlapack.dylib |sed -n -e '2 s/.\(.*\) (compat.*/\1/p'` \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" ; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" \
$(Rexeclibdir)/libRlapack.dylib; \
fi)
@(cp -R $(srcdir)/src/include $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders && \
cp src/include/config.h $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders/ && \
find $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders -name .svn | xargs rm -rf)
@(install_name_tool -change libR.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
$(R_FRAMEWORK_DIR)/Resources/bin/exec/R)
@(find "$(R_FRAMEWORK_DIR)/Resources/" -name '*.so' -exec install_name_tool \
$(Rexecbindir2)/R)
@(find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -exec install_name_tool \
-change libR.dylib "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \{\} \;)
@(if [ "$(Rexeclibdir)" != "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" "$(Rexeclibdir)/libR.dylib"; \
if [ -e "$(Rexeclibdir)/libRlapack.dylib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" "$(Rexeclibdir)/libRlapack.dylib"; \
fi \
fi )
@(if [ -n "${R_ARCH}" ]; then \
if [ "${R_ARCH}" != /ppc -a "${R_ARCH}" != /i386 -a "${R_ARCH}" != /ppc64 ]; then \
echo "\
*** WARNING: The architecture name is incompatible with Apple's naming~ convention. This may prevent applications from using the R~ framework. Please use i386, ppc or ppc64 as architecture~ names to allow universal builds."|sed 'y/~/\n/' >&2; \
else \
for f in `ls "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/${R_ARCH}/"*.h|xargs basename`; do \
echo "/* This is an automatically generated universal stub for architecture-dependent headers. */~#ifdef __i386__~#include <i386/$$f>~#else~#ifdef __ppc__~#include <ppc/$$f>~#else~#ifdef __ppc64__~#include <ppc64/$$f>~#else~#error Cannot determine the correct architecture. To force a certain configuration, include architecture-specific include path *before* general R headers path.~#endif~#endif~#endif" |sed -e 'y/~/\n/' > "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/$$f"; \
done; \
fi \
fi )
TAGS:
This diff is collapsed.
......@@ -2,7 +2,7 @@
THE BASIC R README
(See "FAQ" and "RESOURCES" for more detailed information
(See "doc/FAQ" and "doc/RESOURCES" for more detailed information
- these files are only in the tarballs)
(See "INSTALL" for help on installation)
......@@ -47,7 +47,7 @@ large group of individuals has contributed to R by sending code and bug
reports.
Since mid-1997 there has been a core group who can modify the R source
code archive, listed in file AUTHORS.
code archive, listed in file doc/AUTHORS.
R 1.0.0 was released on 29 February 2000 and 2.0.0 on 4 October 2004.
......
Revision: 36812
Last Changed Date: 2005-12-20
Revision: 37909
Last Changed Date: 2006-04-24
R2K Statement
We expect R to be Y2K compliant when compiled and run on a Y2K compliant
system. In particular R does not internally represent or manipulate dates
as two-digit quantities. However, no guarantee of Y2K compliance is
provided for R. R is free software and comes with NO WARRANTY WHATSOEVER.
R, like any other programming language, can be used to write programs
and manipulate data in ways that are not Y2K compliant.
......@@ -15,8 +15,8 @@
### You should have received a copy of the GNU General Public License
### along with R; if not, you can obtain it via the World Wide Web at
### 'http://www.gnu.org/copyleft/gpl.html', or by writing to the Free
### Software Foundation, 59 Temple Place -- Suite 330, Boston, MA
### 02111-3307, USE.
### Software Foundation,
### 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
## By means of this file you can (also) provide default values for the
## configuration process. To set variables, uncomment the VAR=DEFAULT
......@@ -48,9 +48,9 @@
## Debugging and optimization options for the C compiler.
## Use this to specify CFLAGS for the version of the C compiler
## specified above.
## If unspecified, defaults to '-g -O2' for gcc, and '-g' in all other
## cases.