[med-svn] [r-cran-rmarkdown] 01/03: Remove code copies and compressed JS
Andreas Tille
tille at debian.org
Mon Dec 11 16:29:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-rmarkdown.
commit 0f840e3ee6754340a0279e6a29682651b16f065c
Author: Andreas Tille <tille at debian.org>
Date: Mon Dec 11 17:25:38 2017 +0100
Remove code copies and compressed JS
---
debian/changelog | 2 +-
debian/control | 9 ++++++++-
debian/copyright | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/links | 6 ++++++
debian/watch | 4 +++-
5 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6acce74..6aeb903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-r-cran-rmarkdown (1.8-1) unstable; urgency=medium
+r-cran-rmarkdown (1.8+dfsg-1) UNRELEASED; urgency=medium
* Initial release (closes: #884115)
diff --git a/debian/control b/debian/control
index 58adbc1..6083707 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,14 @@ Package: r-cran-rmarkdown
Architecture: all
Depends: ${R:Depends},
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ libjs-bootstrap,
+ libjs-highlight.js,
+ libjs-jquery,
+ libjs-jquery-ui,
+ fonts-font-awesome,
+ r-cran-shiny
+# r-cran-shiny dependency to get jquery-ui files
Recommends: ${R:Recommends}
Suggests: ${R:Suggests}
Description: convert R markdown documents into a variety of formats.
diff --git a/debian/copyright b/debian/copyright
index 68cbdc8..4e793c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: rmarkdown
Upstream-Contact: Yihui Xie <xie at yihui.name>
Source: https://cran.r-project.org/package=rmarkdown
+Files-Excluded: */bootstrap-*
+ */font-awesome-4.5.0
+ */jquery-*
+ */highlight.js
+ */jqueryui-1.11.4
Files: *
Copyright: 2014-2017 JJ Allaire, Yihui Xie, Jonathan McPherson, Javier Luraschi,
@@ -10,6 +15,31 @@ Copyright: 2014-2017 JJ Allaire, Yihui Xie, Jonathan McPherson, Javier Luraschi,
Ruben Arslan, RStudio, Inc.,
License: GPL-3
+Files: inst/rmd/h/highlightjs/*
+Copyright: 2006-2017 Ivan Sagalaev <maniac at softwaremaniacs.org>
+License: BSD-3-clause
+
+Files: inst/rmd/h/ionicons-2.0.1/*
+Copyright: 2014 Drifty (http://drifty.com/)
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
Files: debian/*
Copyright: 2017 Andreas Tille <tille at debian.org>
License: GPL-3
@@ -27,3 +57,28 @@ License: GPL-3
.
On Debian systems you find a copy of the full text of the GNU General Public
License at /usr/share/common-licenses/GPL-.
+
+License: BSD-3-clause
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of highlight.js nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..9c401c6
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,6 @@
+usr/share/javascript/bootstrap usr/lib/R/site-library/rmarkdown/rmd/h/bootstrap-3.3.5
+usr/share/javascript/highlight.js/highlight.min.js usr/lib/R/site-library/rmarkdown/rmd/h/highlightjs/highlight.js
+usr/share/fonts-font-awesome/css usr/lib/R/site-library/rmarkdown/rmd/h/font-awesome-4.5.0/css
+usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf usr/lib/R/site-library/rmarkdown/rmd/h/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
+usr/share/javascript/jquery/jquery.min.js usr/lib/R/site-library/rmarkdown/rmd/h/jquery-1.11.3/jquery.min.js
+usr/lib/R/site-library/shiny/www/shared/jqueryui usr/lib/R/site-library/rmarkdown/rmd/h/jqueryui-1.11.4
diff --git a/debian/watch b/debian/watch
index cc92254..6d60dab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=4
-https://cran.r-project.org/src/contrib/rmarkdown_([-\d.]*)\.tar\.gz
+
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+ https://cran.r-project.org/src/contrib/rmarkdown_([-\d.]*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-rmarkdown.git
More information about the debian-med-commit
mailing list