Commit 51e699d4 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.2.1-1

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

  * New upstream version 2.2.1 released this morning
  
  * debian/control: Remove unnecessary f2c from Depends: in r-base-dev 
  * debian/rules: Set DH_COMPAT=4

r-base (2.2.0.rc.20051214-1) unstable; urgency=low

  * Second beta release of the upcoming R 2.2.1 planned for December 20

r-base (2.2.0.rc.20051206-1) unstable; urgency=low

  * First beta release of the upcoming R 2.2.1 planned for December 20

  * debian/rules: Install bash completion file debian/R.bash_completion 
    by Deepayan Sarkar and announced to r-devel on 2005-11-30

r-base (2.2.0.final-4) unstable; urgency=low

  * debian/rules: Really skip 'make check' on hppa	(Closes: #333462)

r-base (2.2.0.final-3) unstable; urgency=low

  * debian/rules: Skip 'make check' on hppa		(Closes: #333462)

r-base (2.2.0.final-2) unstable; urgency=low

  * Rebuilt with properly renamed .orig.tar.gz          (Closes: #332586)

r-base (2.2.0.final-1) unstable; urgency=low

  * New upstream version 2.2.0 released today, following six
    Debian pre-releases  (and a repeat of a version number snafu made
    years ago, hence the need for the '.final')

r-base (2.2.0.beta.20050929-1) unstable; urgency=low

  * Second weekly beta release (using 2005-09-22 candidate) of R 2.2.0 

  * debian/rules: Call configure with LIBnn=lib to enforce use of
    /usr/lib everywhere, including amd64  		(Closes: #329952)

  * share/perl/build-help.pl: Wrote patch to re-enable deprecated --htmllists
    argument as a no-op so that our r-cran-* postinst files can call it.

r-base (2.2.0.beta.20050922-2) unstable; urgency=low

  * debian/rules:  Create softlink from R's TeX files (used for doc.
    and Sweave) into the texmf hierarchy. (Thanks, Gregor Gorjanc)
  * debian/r-base-core.dirs: Add 'usr/share/texmf/tex/latex'
  * debian/r-base-core.postinst: Call texhash if it exists
  
  * Really re-apply the Perl fix (share/perl/{build-help.pl,R/Rdlists.pm)
    to maintain compatibility with all the r-cran-* packages postinst
    							(Closes: #330085)

r-base (2.2.0.beta.20050922-1) unstable; urgency=low

  * First beta release candidate (dated 2005-09-22) of R 2.2.0 

  * Following prior practice, this release is designated for unstable
    after the two first alpha releases in experiment. 

  * share/perl/build-help.pl, share/perl/R/Rdlists.pm: As in the previous
    snapshot, fall back to R 2.1.1 code to support other r-cran-* packages

r-base (2.2.0.alpha.20050915-1) experimental; urgency=low

  * Second alpha release of the upcoming R 2.2.0 planned for October 6

  * share/perl/build-help.pl, share/perl/R/Rdlists.pm: As in the previous
    snapshot, fall back to R 2.1.1 code to support other r-cran-* packages

r-base (2.2.0.alpha.20050908-2) experimental; urgency=low

  * debian/rules: Also re-set the newly added variables R_SHARE_DIR, 
    R_INCLUDE_DIR and R_DOC_DIR in /usr/bin/R 		(Closes: #327446)

  * share/perl/build-help.pl: Revert to the version from R 2.1.1 as
    we need the now deprecated --htmllists argument in the postinst
    and postrm scripts of several dozen r-cran-* packages.
  * share/perl/R/Rdlists.pm: Carry build_htmlpkglists() and read_titles()
    over from 2.1.1 to support the --htmllists code

r-base (2.2.0.alpha.20050908-1) experimental; urgency=low

  * First alpha release of the upcoming R 2.2.0 planned for October 6

  * debian/{control,rules}: Build-Depends switched to gcc-4.0 
    by removing "gcc-3.4, g++-3.4, g77-3.4" 
parents 4073d6c7 2384e0d3

Too many changes to show.

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

......@@ -57,7 +57,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
^L
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
......@@ -90,9 +90,8 @@ special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
becomes a de-facto standard. To achieve this, non-free programs must
be allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
......@@ -114,7 +113,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
^L
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
......@@ -140,8 +139,7 @@ included without limitation in the term "modification".)
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control
compilation
and installation of the library.
compilation and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
......@@ -220,7 +218,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
^L
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
......@@ -271,7 +269,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
^L
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
......@@ -307,10 +305,10 @@ of these things:
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
c) Accompany the work with a written offer, valid for at least
three years, to give the same user the materials specified in
Subsection 6a, above, for a charge no more than the cost of
performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
......@@ -333,7 +331,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
^L
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
......@@ -374,7 +372,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
^L
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
......@@ -427,7 +425,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
^L
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
......@@ -461,7 +459,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
^L
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
......@@ -477,14 +475,13 @@ have at least the "copyright" line and a pointer to where the full
notice is found.
<one line to give the library's name and a brief idea of what it
does.>
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -495,17 +492,15 @@ does.>
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper
mail.
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or
your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
your school, if any, to sign a "copyright disclaimer" for the library,
if necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James
Random Hacker.
Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
......
......@@ -100,6 +100,7 @@ src/appl/maxcol.c
src/appl/interv.c : moved to API from code originally in
src/library/stats/src/bvalue.f, see the following
src/library/stats:
See the file src/library/stats/COPYRIGHTS.modreg for details
......@@ -204,7 +205,7 @@ src/main/vsnprintf.c
src/main/regex.c
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
src/main/Rregex.h
Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003
Free Software Foundation, Inc.
......@@ -219,7 +220,7 @@ src/extra/xdr/*
src/extra/zlib/README, *.c, *.h
Taken from zlib-1.2.1 (C) 1995-2003 Jean-loup Gailly and Mark Adler
Taken from zlib-1.2.3 (C) 1995-2005 Jean-loup Gailly and Mark Adler
See src/extra/zlib/README for the licence.
......@@ -231,7 +232,7 @@ src/main/dounzip.c, unzip.h
src/main/acosh.c, asinh.c, atanh.c
used on Windows mainly. Based on
used as substitution code only. Based on
Cephes Math Library Release 2.8: June, 2000
Copyright 1984, 1995, 2000 by Stephen L. Moshier
......@@ -244,15 +245,9 @@ src/main/apse.h
src/extra/pcre/LICENCE
src/extra/pcre/dftables.c
src/extra/pcre/get.c
src/extra/pcre/internal.h
src/extra/pcre/maketables.c
src/extra/pcre/pcre.c
src/extra/pcre/pcre.h
src/extra/pcre/study.c
Copyright (c) 1997-2004 University of Cambridge
src/extra/pcre/*.[ch]
Copyright (c) 1997-2005 University of Cambridge
All rights reserved.
See file src/extra/pcre/LICENCE. For binary builds of R that requires
......@@ -268,9 +263,10 @@ us to include
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the University of Cambridge nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
* Neither the name of the University of Cambridge nor the name of Google
Inc. nor the names of their contributors may be used to endorse or
promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
......@@ -296,7 +292,7 @@ src/extra/bzip2/decompress.c
src/extra/bzip2/huffman.c
src/extra/bzip2/randtable.c
copyright (C) 1996-2002 Julian R Seward.
copyright (C) 1996-2005 Julian R Seward.
src/library/tools/src/md5.[ch]
......@@ -316,3 +312,9 @@ src/extra/intl/*
Based on gettextize from gettext 0.14.1
Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
src/include/memcheck.h
src/include/valgrind.h
From valgrind,
Copyright (C) 2000-2005 Julian Seward. All rights reserved.
This diff is collapsed.
......@@ -43,11 +43,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DIR = ${INSTALL} -d
JAVAC = @JAVAC@
JAVA_HOME = @JAVA_HOME@
JAVA_PROG = @JAVA_PROG@
JAVA_LD_PATH = @JAVA_LD_PATH@
JAVA_LIBS = @JAVA_LIBS@
LATEX = @LATEX@
LDFLAGS = @LDFLAGS@
LIBM = @LIBM@
LIBR = @LIBR@
LIBS = @LIBS@
LIBnn = @LIBnn@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAIN_CFLAGS = @MAIN_CFLAGS@
......@@ -102,16 +107,25 @@ ALL_FFLAGS_LO = $(R_XTRA_FFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
prefix = @prefix@
exec_prefix = @exec_prefix@
## only used for installing 'R'.
bindir = @bindir@
## not used
datadir = @datadir@
## used for 'rhome' and installation of standalone Rmath
libdir = @libdir@
## used for man page
mandir = @mandir@
## used for installation of standalone Rmath headers
includedir = @includedir@
rhome = @libdir@/R
rhome = ${libdir}/R
rsharedir = @rsharedir@
rincludedir = @rincludedir@
rdocdir = @rdocdir@
## Overrides for installing R as a framework (MacOSX).
@WANT_R_FRAMEWORK_TRUE@rhome = $(R_FRAMEWORK_DIR)/Versions/$(VERSION)/Resources
## Overrides for installing R as a framework (MacOS X).
@WANT_R_FRAMEWORK_TRUE@FW_VERSION = @FW_VERSION@
@WANT_R_FRAMEWORK_TRUE@rhome = $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources
@WANT_R_FRAMEWORK_TRUE@bindir = $(rhome)
@WANT_R_FRAMEWORK_TRUE@mandir = $(rhome)
......
......@@ -10,15 +10,14 @@ top_builddir = .
include $(top_builddir)/Makeconf
distdir = $(PACKAGE)-$(VERSION)
INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS NEWS ONEWS THANKS
NON_SVN_INSTFILES = FAQ RESOURCES
INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS NEWS THANKS
NON_SVN_INSTFILES = FAQ RESOURCES SVN-REVISION
DISTFILES = $(INSTFILES) \
ChangeLog INSTALL OONEWS README VERSION Y2K \
ChangeLog INSTALL ONEWS OONEWS README VERSION Y2K \
Makeconf.in Makefile.in \
config.site configure configure.ac \
date-stamp
SUBDIRS = m4 tools doc etc share src po tests
SUBDIRS_WITH_NO_BUILD = debian
config.site configure configure.ac
SUBDIRS = m4 tools doc etc share src tests @USE_NLS_TRUE@ po
SUBDIRS_WITH_NO_BUILD =
all: Makefile Makeconf R docs recommended
recommended: @USE_RECOMMENDED_PACKAGES_TRUE@ stamp-recommended
......@@ -34,6 +33,7 @@ ACINCLUDE_DEPENDENCIES = \
m4/clibs.m4 \
m4/codeset.m4 \
m4/gettext.m4 \
m4/java.m4 \
m4/libtool.m4
CONFIGURE_DEPENDENCIES = $(srcdir)/VERSION