Commit 1721ed5a authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.2.1-4

r-base (3.2.1-4) unstable; urgency=low

  * src/main/datetime.c: One more change for the additional leapsecond

  * debian/control: Add ca-certificates to Depends: for r-base-core to
    support https via method "libcurl"
parent 136a5138
r-base (3.2.1-4) unstable; urgency=low
* src/main/datetime.c: One more change for the additional leapsecond
* debian/control: Add ca-certificates to Depends: for r-base-core to
support https via method "libcurl"
-- Dirk Eddelbuettel <edd@debian.org> Fri, 03 Jul 2015 03:40:19 -0500
r-base (3.2.1-3) unstable; urgency=low
* src/library/base/R/zdatetime.R: Added additional leap second (also
......
......@@ -45,7 +45,7 @@ Description: GNU R statistical computation and graphics system
Package: r-base-core
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0)
Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0), ca-certificates
Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0), r-gnome (<= 2.3.1), r-cran-rcompgen (<= 0.1-17-1), r-base-latex (<= 2.9.2-4)
Provides: r-gnome, r-cran-rcompgen, r-base-latex, r-api-3
Conflicts: r-gnome, r-cran-rcompgen, r-base-latex
......
......@@ -303,14 +303,15 @@ static Rboolean have_broken_mktime(void)
}
#ifndef HAVE_POSIX_LEAPSECONDS
/* There have been 25 leapseconds: see .leap.seconds in R
/* There have been many leapseconds: see .leap.seconds in R
* (as.Date(.leap.seconds)-as.Date("1970-01-01"))*86400
*/
static int n_leapseconds = 25;
static const time_t leapseconds[] =
{ 78796800, 94694400,126230400,157766400,189302400,220924800,252460800,
283996800,315532800,362793600,394329600,425865600,489024000,567993600,
631152000,662688000,709948800,741484800,773020800,820454400,867715200,
915148800,1136073600,1230768000,1341100800};
915148800,1136073600,1230768000,1341100800,1435708800};
static int n_leapseconds = sizeof(leapseconds)/sizeof(time_t);
#endif
static double guess_offset (stm *tm)
......
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