summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-03-15 16:19:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-03-15 16:19:38 +0000
commit0c25b0a4ace23a3a057e6c9efe57ba0f2e670390 (patch)
treee72c53bdc726b2fa1f382c817f94ebfa07390629
parentMerging upstream version 3.4.4. (diff)
downloadr-base-0c25b0a4ace23a3a057e6c9efe57ba0f2e670390.zip
r-base-0c25b0a4ace23a3a057e6c9efe57ba0f2e670390.tar.xz
Merging debian version 3.4.4-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/Rprofile.site9
-rw-r--r--debian/changelog14
-rw-r--r--debian/control2
-rw-r--r--debian/r-base-core.lintian1
-rw-r--r--debian/r-mathlib.lintian1
5 files changed, 25 insertions, 2 deletions
diff --git a/debian/Rprofile.site b/debian/Rprofile.site
index f44b62a..3bfa9cd 100644
--- a/debian/Rprofile.site
+++ b/debian/Rprofile.site
@@ -1,7 +1,7 @@
## Emacs please make this -*- R -*-
## empty Rprofile.site for R on Debian
##
-## Copyright (C) 2008 Dirk Eddelbuettel and GPL'ed
+## Copyright (C) 2008 - 2018 Dirk Eddelbuettel and GPL'ed
##
## see help(Startup) for documentation on ~/.Rprofile and Rprofile.site
@@ -21,3 +21,10 @@
# r["CRAN"] <- "http://my.local.cran"
# options(defaultPackages = c(old, "MASS"), repos = r)
#})
+
+## We set the cloud mirror, which is 'network-close' to everybody, as default
+local({
+ r <- getOption("repos")
+ r["CRAN"] <- "https://cloud.r-project.org"
+ options(repos = r)
+})
diff --git a/debian/changelog b/debian/changelog
index 5e7cfaa..91e2f9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+r-base (3.4.4-1) unstable; urgency=medium
+
+ * New upstream version released this morning
+
+ -- Dirk Eddelbuettel <edd@debian.org> Thu, 15 Mar 2018 06:28:51 -0500
+
+r-base (3.4.3.20180311-1) unstable; urgency=medium
+
+ * Initial rc build (r74380) of R 3.4.4 expected for March 15
+
+ * debian/Rprofile.site: Set CRAN cloud mirror as default CRAN repo
+
+ -- Dirk Eddelbuettel <edd@debian.org> Sun, 11 Mar 2018 08:41:22 -0500
+
r-base (3.4.3-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remainining changes:
diff --git a/debian/control b/debian/control
index 82b09d5..4bac38f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Dirk Eddelbuettel <edd@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 4.1.1
+Standards-Version: 4.1.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.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-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, openjdk-9-jdk | default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], mpack, bash-completion
Homepage: http://www.r-project.org/
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/r-base
diff --git a/debian/r-base-core.lintian b/debian/r-base-core.lintian
index f3422dd..df05102 100644
--- a/debian/r-base-core.lintian
+++ b/debian/r-base-core.lintian
@@ -108,3 +108,4 @@ r-base-core: extra-license-file usr/share/R/share/licenses/LGPL-2
r-base-core: extra-license-file usr/share/R/share/licenses/LGPL-2.1
r-base-core: extra-license-file usr/share/R/share/licenses/LGPL-3
r-base-core: package-installs-java-bytecode usr/share/R/share/java/getsp.class
+r-base-core: pkg-config-unavailable-for-cross-compilation usr/lib/pkgconfig/libR.pc
diff --git a/debian/r-mathlib.lintian b/debian/r-mathlib.lintian
index 422ac56..7ec2d43 100644
--- a/debian/r-mathlib.lintian
+++ b/debian/r-mathlib.lintian
@@ -3,3 +3,4 @@ r-mathlib: missing-depends-line
r-mathlib: package-name-doesnt-match-sonames libRmath1
r-mathlib: hardening-no-relro usr/lib/libRmath.so.1.0.0
r-mathlib: maintscript-calls-ldconfig postinst
+r-mathlib: pkg-config-unavailable-for-cross-compilation usr/lib/pkgconfig/libRmath.pc