[rstudio] 08/10: replace jquery.js by packaged version

[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 f0399aea025f5cdba2f1ca5052d8f1cf4df7c759
Author: Andreas Tille <tille at debian.org>
Date:   Fri Apr 29 14:33:33 2016 +0200

    replace jquery.js by packaged version
---
 debian/control   | 1 +
 debian/copyright | 1 +
 debian/links     | 1 +
 debian/rules     | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 187dac8..a4c3a27 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          hunspell-en-us | hunspell-dictionary,
          libjs-jquery-ui,
+         libjs-jquery,
          libjs-mathjax,
          libjs-pdf,
          pandoc,
diff --git a/debian/copyright b/debian/copyright
index 49becae..7724baf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,7 @@ Files-Excluded: dependencies
                 src/cpp/session/resources/pdfjs
                 src/cpp/session/resources/grid/jquery
                 */Lato-*.ttf
+                */jquery.js
 
 Files: *
 Copyright: © 20xx-20yy <upstream>
diff --git a/debian/links b/debian/links
index 355b71c..ffb1933 100644
--- a/debian/links
+++ b/debian/links
@@ -2,3 +2,4 @@ usr/share/fonts/truetype/lato/Lato-Bold.ttf		usr/share/rstudio/resources/present
 usr/share/fonts/truetype/lato/Lato-BoldItalic.ttf	usr/share/rstudio/resources/presentation/revealjs/fonts/Lato-BoldItalic.ttf
 usr/share/fonts/truetype/lato/Lato-Italic.ttf		usr/share/rstudio/resources/presentation/revealjs/fonts/Lato-Italic.ttf
 usr/share/fonts/truetype/lato/Lato-Regular.ttf 		usr/share/rstudio/resources/presentation/revealjs/fonts/Lato-Regular.ttf
+usr/share/javascript/jquery/jquery.js			usr/share/rstudio/resources/grid/datatables/js/jquery.js
diff --git a/debian/rules b/debian/rules
index b5f1384..7bc99e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,6 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DQT_QMAKE_EXECUTABLE=qmake \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DRSTUDIO_INSTALL_BIN=/usr/lib/rstudio/bin \
-		-DRSTUDIO_INSTALL_SUPPORTING=/usr/share/rstudio
+		-DRSTUDIO_INSTALL_BIN=/lib \
+		-DRSTUDIO_INSTALL_SUPPORTING=/usr/lib
 

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