[med-svn] [r-cran-shiny] 01/06: Hack for symlinks to twitter-bootstrap and javascript

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-shiny.

commit b11fc319dd4197f224529d6d7f44f08cdc18c44c
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 14 13:18:30 2017 +0200

    Hack for symlinks to twitter-bootstrap and javascript
---
 debian/changelog                                  |  8 ++++++++
 debian/patches/fix_utils_resolve_for_debian.patch | 25 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5431ae4..cec7c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+r-cran-shiny (1.0.0+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Don Armstrong ]
+  * Hack for symlinks to twitter-bootstrap and javascript
+    Closes: #867963
+
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Sep 2017 13:17:43 +0200
+
 r-cran-shiny (1.0.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/fix_utils_resolve_for_debian.patch b/debian/patches/fix_utils_resolve_for_debian.patch
new file mode 100644
index 0000000..76b2fbe
--- /dev/null
+++ b/debian/patches/fix_utils_resolve_for_debian.patch
@@ -0,0 +1,25 @@
+Description: Hack for symlinks to twitter-bootstrap and javascript
+ Also allow serving /usr/share/javascript and
+ /usr/share/twitter-boostrap/ from shiny apps by default
+Author: Don Armstrong <don at debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/867963
+Forwarded: not-needed
+Last-Update: 2017-07-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/R/utils.R
++++ b/R/utils.R
+@@ -298,6 +298,12 @@ resolve <- function(dir, relpath) {
+   dir <- normalizePath(dir, winslash='/', mustWork=TRUE)
+   # trim the possible trailing slash under Windows (#306)
+   if (isWindows()) dir <- sub('/$', '', dir)
++  ## Debian specific hack for /usr/share/javascript symlinks
++  if (substr(abs.path,1,nchar('/usr/share/javascript/'))=='/usr/share/javascript/')
++      return(abs.path)
++  ## Debian specific hack for /usr/share/twitter-bootstrap symlinks
++  if (substr(abs.path,1,nchar('/usr/share/twitter-bootstrap/'))=='/usr/share/twitter-bootstrap/')
++      return(abs.path)
+   if (nchar(abs.path) <= nchar(dir) + 1)
+     return(NULL)
+   if (substr(abs.path, 1, nchar(dir)) != dir ||
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..337a7c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_utils_resolve_for_debian.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-shiny.git