[r-cran-knitr] 01/02: Replace libjs-jquery

Sat May 7 12:41:31 UTC 2016

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

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

commit af0250c0392f30550bcec104710290e4424cb809
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 7 14:22:47 2016 +0200

    Replace libjs-jquery
---
 debian/control                          |  3 ++-
 debian/patches/privacy_breach_fix.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index fea4cdf..eb5df93 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 9),
                r-cran-stringr,
                libjs-mathjax,
                libjs-highlight.js,
-               node-highlight.js
+               node-highlight.js,
+               libjs-jquery
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/r-cran-knitr.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/r-cran-knitr.git
diff --git a/debian/patches/privacy_breach_fix.patch b/debian/patches/privacy_breach_fix.patch
index b782cc9..fac534d 100644
--- a/debian/patches/privacy_breach_fix.patch
+++ b/debian/patches/privacy_breach_fix.patch
@@ -22,6 +22,15 @@ Description: Replace privacy breach links by packaged copies
  <script type="text/javascript">
  hljs.LANGUAGES.r=function(a){var b="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[a.HCM,{b:b,l:b,k:{keyword:"function if in break next repeat else for return switch while try tryCatch|10 stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...|10",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\ [...]
  </script>
+@@ -220,7 +220,7 @@ happens.</p>
+ </td><td class="code"></td></tr>
+       </table><!--table end-->
+     </div>
+-  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
++  <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
+   <script src="http://yihui.name/knitr/js/docco-resize.js"></script>
+   </body>
+ </html>
 --- a/inst/doc/docco-linear.html
 +++ b/inst/doc/docco-linear.html
 @@ -13,12 +13,12 @@ img{display:block;margin:auto;}
@@ -97,6 +106,15 @@ Description: Replace privacy breach links by packaged copies
  <script type="text/javascript">
  hljs.LANGUAGES.r=function(a){var b="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[a.HCM,{b:b,l:b,k:{keyword:"function if in break next repeat else for return switch while try tryCatch|10 stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...|10",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\ [...]
  </script>
+@@ -23,7 +23,7 @@ hljs.LANGUAGES.r=function(a){var b="([a-
+ #!html_output#
+       </table><!--table end-->
+     </div>
+-  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
++  <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
+   <script src="http://yihui.name/knitr/js/docco-resize.js"></script>
+   </body>
+ </html>
 --- a/inst/misc/docco-template.html
 +++ b/inst/misc/docco-template.html
 @@ -13,8 +13,8 @@ img{display:block;margin:auto;}
@@ -112,6 +130,15 @@ Description: Replace privacy breach links by packaged copies
  #!mathjax#
 --- a/inst/opencpu/apps/index.html
 +++ b/inst/opencpu/apps/index.html
+@@ -4,7 +4,7 @@
+ <head>
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <title>R Notebook: A knitr app on OpenCPU</title>
+-  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
++  <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
+   <!-- Styles for R syntax highlighter -->
+   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
+   <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
 @@ -16,8 +16,8 @@
      }
    </style>

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

