[r-base] 04/04: Merge branch 'master' into debian/jessie-backports
Johannes Ranke
jranke-guest at moszumanska.debian.org
Fri Jul 1 13:36:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
jranke-guest pushed a commit to branch debian/jessie-backports
in repository r-base.
commit a01f01e2f0820a014d5cad2865447811048b6045
Merge: 235d1d1 6457b0e
Author: Johannes Ranke <jranke at uni-bremen.de>
Date: Fri Jul 1 14:42:45 2016 +0200
Merge branch 'master' into debian/jessie-backports
Conflicts:
debian/changelog
Removed changelog entry of last backport, added new changelog entry for
backport
SVN-REVISION | 4 +-
VERSION | 2 +-
VERSION-NICK | 2 +-
configure | 18 ++--
debian/changelog | 24 +++++-
debian/control | 4 +-
doc/FAQ | 4 +-
doc/NEWS | 40 +++++++++
doc/NEWS.Rd | 53 +++++++++++-
doc/NEWS.pdf | Bin 423988 -> 426159 bytes
doc/html/NEWS.html | 64 ++++++++++++++
doc/html/R-admin.html | 100 ++++++++++++----------
doc/manual/R-FAQ.texi | 4 +-
doc/manual/R-admin.texi | 28 +++---
doc/manual/R-intro.texi | 16 +++-
doc/manual/R-ints.texi | 36 ++++----
share/texmf/bibtex/bib/RJournal.bib | 78 +++++++++++++++++
src/gnuwin32/cran/rdevel.in | 9 +-
src/include/R.h | 2 +-
src/library/Recommended/KernSmooth_2.23-15.tar.gz | Bin 24572 -> 24572 bytes
src/library/Recommended/MASS_7.3-45.tar.gz | Bin 487268 -> 487268 bytes
src/library/Recommended/boot_1.3-18.tar.gz | Bin 231830 -> 231831 bytes
src/library/Recommended/class_7.3-14.tar.gz | Bin 19726 -> 19726 bytes
src/library/Recommended/nlme.tgz | 2 +-
src/library/Recommended/nlme_3.1-127.tar.gz | Bin 776625 -> 0 bytes
src/library/Recommended/nlme_3.1-128.tar.gz | Bin 0 -> 778999 bytes
src/library/Recommended/nnet_7.3-12.tar.gz | Bin 28523 -> 28521 bytes
src/library/Recommended/rpart_4.1-10.tar.gz | Bin 818525 -> 818520 bytes
src/library/Recommended/spatial_7.3-11.tar.gz | Bin 44664 -> 44666 bytes
src/library/Recommended/survival.tgz | 2 +-
src/library/Recommended/survival_2.39-2.tar.gz | Bin 5015076 -> 0 bytes
src/library/Recommended/survival_2.39-4.tar.gz | Bin 0 -> 5033647 bytes
src/library/base/R/datetime.R | 5 ++
src/library/base/R/factor.R | 3 +-
src/library/base/R/format.R | 7 +-
src/library/base/R/namespace.R | 4 +-
src/library/base/R/windows/system.R | 5 +-
src/library/base/man/Platform.Rd | 6 +-
src/library/base/man/assign.Rd | 4 +-
src/library/base/man/assignOps.Rd | 11 +--
src/library/base/man/bindenv.Rd | 4 +-
src/library/base/man/difftime.Rd | 12 ++-
src/library/base/man/files.Rd | 13 ++-
src/library/base/man/locales.Rd | 6 +-
src/library/base/man/merge.Rd | 8 +-
src/library/base/man/ns-load.Rd | 9 +-
src/library/base/man/raw.Rd | 9 +-
src/library/base/man/sink.Rd | 11 +--
src/library/base/man/weekday.POSIXt.Rd | 5 +-
src/library/base/man/withVisible.Rd | 6 +-
src/library/datasets/man/Nile.Rd | 6 +-
src/library/grDevices/R/prettyDate.R | 11 +--
src/library/grDevices/tests/ps-tests.Rout.save | 4 +-
src/library/grDevices/tests/xfig-tests.Rout.save | 4 +-
src/library/graphics/R/text.R | 7 +-
src/library/graphics/man/legend.Rd | 5 +-
src/library/graphics/man/text.Rd | 4 +-
src/library/grid/inst/doc/displaylist.pdf | Bin 157081 -> 157013 bytes
src/library/grid/inst/doc/frame.pdf | Bin 155673 -> 155617 bytes
src/library/grid/inst/doc/grid.pdf | Bin 251516 -> 251586 bytes
src/library/grid/inst/doc/grobs.pdf | Bin 106861 -> 106784 bytes
src/library/grid/inst/doc/interactive.pdf | Bin 90560 -> 90490 bytes
src/library/grid/inst/doc/locndimn.pdf | Bin 89208 -> 89146 bytes
src/library/grid/inst/doc/moveline.pdf | Bin 86954 -> 86880 bytes
src/library/grid/inst/doc/nonfinite.pdf | Bin 79199 -> 79127 bytes
src/library/grid/inst/doc/plotexample.pdf | Bin 223636 -> 223699 bytes
src/library/grid/inst/doc/rotated.pdf | Bin 121541 -> 121455 bytes
src/library/grid/inst/doc/saveload.pdf | Bin 133573 -> 133501 bytes
src/library/grid/inst/doc/sharing.pdf | Bin 70524 -> 70446 bytes
src/library/grid/inst/doc/viewports.pdf | Bin 162721 -> 162672 bytes
src/library/grid/tests/testls.Rout.save | 4 +-
src/library/methods/man/setClass.Rd | 47 +++++-----
src/library/methods/tests/testIs.R | 9 ++
src/library/parallel/inst/doc/parallel.pdf | Bin 291612 -> 291231 bytes
src/library/parallel/tests/multicore2.Rout.save | 4 +-
src/library/parallel/tests/snow2.Rout.save | 4 +-
src/library/stats/COPYRIGHTS.modreg | 2 +-
src/library/stats/R/runmed.R | 4 +-
src/library/stats/man/dendrogram.Rd | 9 +-
src/library/stats/man/deriv.Rd | 10 +--
src/library/stats/man/median.Rd | 6 +-
src/library/stats/man/model.matrix.Rd | 10 ++-
src/library/stats/man/relevel.Rd | 13 +--
src/library/stats/man/reorder.factor.Rd | 23 ++---
src/library/stats/man/shapiro.test.Rd | 4 +-
src/library/stats/man/smooth.spline.Rd | 4 +-
src/library/stats/src/deriv.c | 2 +-
src/library/stats/tests/glm.Rout.save | 4 +-
src/library/stats/tests/ks-test.Rout.save | 4 +-
src/library/stats/tests/nls.Rout.save | 4 +-
src/library/stats/tests/simulate.Rout.save | 4 +-
src/library/tools/R/Vignettes.R | 4 +-
src/library/tools/R/build.R | 10 ++-
src/library/tools/R/index.R | 4 +-
src/library/tools/R/install.R | 17 +---
src/library/utils/R/sessionInfo.R | 3 +-
src/library/utils/inst/doc/Sweave.pdf | Bin 320240 -> 319810 bytes
src/library/utils/man/SweaveUtils.Rd | 7 +-
src/library/utils/man/download.file.Rd | 14 +--
src/library/utils/man/url.show.Rd | 2 +-
src/main/CommandLineArgs.c | 1 -
src/main/character.c | 76 +++++++++-------
src/main/coerce.c | 6 +-
src/main/envir.c | 50 +++++------
src/main/eval.c | 12 +--
src/main/objects.c | 2 +-
src/main/printutils.c | 22 +++--
src/main/unique.c | 60 +++++++------
src/nmath/rgamma.c | 14 +--
src/unix/sys-std.c | 47 ++++++++--
tests/Examples/datasets-Ex.Rout.save | 4 +-
tests/Examples/grDevices-Ex.Rout.save | 4 +-
tests/Examples/graphics-Ex.Rout.save | 8 +-
tests/Examples/grid-Ex.Rout.save | 4 +-
tests/Examples/splines-Ex.Rout.save | 4 +-
tests/Examples/stats-Ex.Rout.save | 22 ++---
tests/Examples/stats4-Ex.Rout.save | 4 +-
tests/Examples/tools-Ex.Rout.save | 6 +-
tests/R-intro.Rout.save | 2 +-
tests/any-all.Rout.save | 2 +-
tests/arith-true.Rout.save | 4 +-
tests/arith.Rout.save | 2 +-
tests/complex.Rout.save | 2 +-
tests/d-p-q-r-tests.Rout.save | 4 +-
tests/datasets.Rout.save | 2 +-
tests/datetime.Rout.save | 2 +-
tests/datetime2.Rout.save | 2 +-
tests/demos.Rout.save | 8 +-
tests/eval-etc.Rout.save | 2 +-
tests/iec60559.Rout.save | 2 +-
tests/internet.Rout.save | 4 +-
tests/isas-tests.Rout.save | 4 +-
tests/lapack.Rout.save | 2 +-
tests/lm-tests.Rout.save | 2 +-
tests/method-dispatch.Rout.save | 2 +-
tests/ok-errors.Rout.save | 2 +-
tests/p-r-random-tests.Rout.save | 4 +-
tests/print-tests.Rout.save | 2 +-
tests/r-strict-tst.R | 5 ++
tests/reg-IO.Rout.save | 2 +-
tests/reg-IO2.Rout.save | 2 +-
tests/reg-S4.Rout.save | 2 +-
tests/reg-examples3.Rout.save | 2 +-
tests/reg-plot.Rout.save | 2 +-
tests/reg-tests-1c.R | 80 ++++++++++++++---
tests/reg-tests-2.Rout.save | 8 +-
tests/reg-tests-3.Rout.save | 2 +-
tests/simple-true.Rout.save | 2 +-
148 files changed, 916 insertions(+), 486 deletions(-)
diff --cc debian/changelog
index ed61c70,72b5b3b..8f6ccb7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,22 +1,28 @@@
- r-base (3.3.0-1~bpo8+1) jessie-backports; urgency=medium
++r-base (3.3.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
- -- Charles Plessy <plessy at debian.org> Fri, 17 Jun 2016 21:13:56 +0900
++ -- Johannes Ranke <jranke at uni-bremen.de> Fri, 01 Jul 2016 14:44:16 +0200
++
+ r-base (3.3.1-1) unstable; urgency=medium
+
+ * New upstream version released this morning
+
+ -- Dirk Eddelbuettel <edd at debian.org> Tue, 21 Jun 2016 05:16:41 -0500
+
+ r-base (3.3.0.20160615-1) unstable; urgency=medium
+
+ * Initial rc build (r70789) of R 3.3.1 expected for June 23
+
+ * debian/control: Set Standards-Version: to current version
+
+ -- Dirk Eddelbuettel <edd at debian.org> Wed, 15 Jun 2016 20:04:57 -0500
+
+ r-base (3.3.0-2) unstable; urgency=medium
+
+ * debian/control: Add libicu-dev to Depends: for r-base-dev
+
+ -- Dirk Eddelbuettel <edd at debian.org> Thu, 19 May 2016 07:35:03 -0500
r-base (3.3.0-1) unstable; urgency=medium
diff --cc debian/control
index 480a657,62ece0a..d0ed16c
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,8 +2,10 @@@ Source: r-bas
Section: gnu-r
Priority: optional
Maintainer: Dirk Eddelbuettel <edd at debian.org>
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
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.6-dev, tk8.6-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, libcurl4-openssl-dev | libcurl4-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff5-dev, xvfb, xauth, xfonts-base, texlive-base, texlive- [...]
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/r-base.git
+Vcs-Git: https://anonscm.debian.org/debian-science/packages/r-base.git
Homepage: http://www.r-project.org/
Package: r-base
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-base.git
More information about the debian-science-commits
mailing list