[rstudio] 06/07: Adapt patch

[Andreas Tille]

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

tille pushed a commit to branch master
in repository rstudio.

commit 6aea25fe225bb432c4548d4f9b2a40bc704a59b3
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 28 13:14:14 2016 +0200

    Adapt patch
---
 debian/patches/remove_external_resources.diff | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/patches/remove_external_resources.diff b/debian/patches/remove_external_resources.diff
index 3056be8..f98da5b 100644
--- a/debian/patches/remove_external_resources.diff
+++ b/debian/patches/remove_external_resources.diff
@@ -4,7 +4,7 @@ Description: prevent third party code installation
 Author: Bertrand Marc <beberking at gmail.com>
 --- a/src/cpp/session/CMakeLists.txt
 +++ b/src/cpp/session/CMakeLists.txt
-@@ -19,18 +19,6 @@
+@@ -19,21 +19,9 @@ add_subdirectory(workers)
  
  # verify that install-dictionaries, install-mathjax, install-pandoc,
  # and install-rmarkdown have been run
@@ -17,13 +17,16 @@ Author: Bertrand Marc <beberking at gmail.com>
 -if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
 -  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
 -endif()
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
+   message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)")
+ endif()
 -if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect")
 -  message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)")
 -endif()
- 
- 
- # verify libclang is installed
-@@ -39,11 +27,11 @@
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/profvis")
+   message(FATAL_ERROR "profvis package not found (re-run install-dependencies script to install)")
+ endif()
+@@ -44,11 +32,11 @@ if(WIN32)
  else()
     set(LIBCLANG_VERSION "3.5")
  endif()
@@ -37,7 +40,7 @@ Author: Bertrand Marc <beberking at gmail.com>
  if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
    message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
  endif()
-@@ -390,14 +378,6 @@
+@@ -406,14 +394,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
     install(FILES ${R_MODULE_SRC_FILES}
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules)
  
@@ -52,8 +55,8 @@ Author: Bertrand Marc <beberking at gmail.com>
     # install pandoc
     if(RSTUDIO_PACKAGE_BUILD_SLES)
        # when producing a SUSE Linux Enterpise build, we want to install the 
-@@ -415,10 +395,6 @@
-    install(FILES ${RSCONNECT_PACKAGE}
+@@ -441,10 +421,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+    install(FILES ${PROFVIS_PACKAGE}
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/packages)
  
 -   # install PDF.js
@@ -63,8 +66,8 @@ Author: Bertrand Marc <beberking at gmail.com>
     # install DataTables
     install(DIRECTORY "resources/grid"
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
-@@ -427,24 +403,6 @@
-    install(DIRECTORY "resources/help_resources"
+@@ -457,24 +433,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+    install(DIRECTORY "resources/notebook"
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
  
 -   # install libclang

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/rstudio.git