Commit 467b852f authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.15.3-2

r-base (2.15.3-2) unstable; urgency=low

  * debian/r-cran.mk: Applied patch by m.eik michalke to also convert '.'
    in package names to '-'

  * debian/arm-perl-regexp.patch: Re-apply ARM patch for regexp from 2.15.2
    with big thanks to Luka Luca Falavigna 		(Closes: #702427)
parent 6eb6c833
--- r-base-2.15.2.orig/src/library/tools/R/install.R
+++ r-base-2.15.2/src/library/tools/R/install.R
@@ -54,7 +54,11 @@
SHLIB_EXT <- if (WINDOWS) ".dll" else {
## can we do better?
mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf")
- sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
+ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
+ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE)
+ } else {
+ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
+ }
}
options(warn = 1)
@@ -1616,8 +1620,13 @@
mconf <- readLines(file.path(R.home(),
paste0("etc", Sys.getenv("R_ARCH")),
"Makeconf"))
- SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
- SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
+ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
+ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE)
+ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE)
+ } else {
+ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
+ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
+ }
MAKE <- Sys.getenv("MAKE")
rarch <- Sys.getenv("R_ARCH")
} else {
r-base (2.15.3-2) unstable; urgency=low
* debian/r-cran.mk: Applied patch by m.eik michalke to also convert '.'
in package names to '-'
* debian/arm-perl-regexp.patch: Re-apply ARM patch for regexp from 2.15.2
with big thanks to Luka Luca Falavigna (Closes: #702427)
-- Dirk Eddelbuettel <edd@debian.org> Sun, 10 Mar 2013 10:04:12 -0500
r-base (2.15.3-1) unstable; urgency=low
* New upstream version released this morning
......
......@@ -7,7 +7,7 @@
# packages. Note that you still need to provide the other files in debian/*,
# in particular control, changelog and copyright.
#
# Copyright 2003-2012 by Dirk Eddelbuettel <edd@debian.org>
# Copyright 2003-2013 by Dirk Eddelbuettel <edd@debian.org>
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/langcore.mk
......@@ -26,7 +26,7 @@ awkString := "'/^(Package|Bundle):/ {print $$2 }'"
# apply it to the upstream meta-info file DESCRIPTION, also generate a lc version
cranNameOrig := $(shell awk "$(awkString)" DESCRIPTION)
cranName := $(shell echo "$(cranNameOrig)" | tr A-Z a-z)
cranName := $(shell echo "$(cranNameOrig)" | tr A-Z a-z | tr . -)
## if no debRreposname is known, set default to cran -- thanks, Steffen!
ifeq ($(debRreposname),)
......
......@@ -54,7 +54,11 @@
SHLIB_EXT <- if (WINDOWS) ".dll" else {
## can we do better?
mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf")
sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE)
} else {
sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
}
}
options(warn = 1)
......@@ -1616,8 +1620,13 @@
mconf <- readLines(file.path(R.home(),
paste0("etc", Sys.getenv("R_ARCH")),
"Makeconf"))
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE)
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE)
} else {
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
}
MAKE <- Sys.getenv("MAKE")
rarch <- Sys.getenv("R_ARCH")
} else {
......
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