[med-svn] [r-cran-rhandsontable] 01/08: Replace jquery.min.js

Fri Dec 1 12:27:44 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-rhandsontable.

commit a04bc2c5eed1ad913ef0a05c212d57e9f72e9f8c
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 1 12:44:20 2017 +0100

    Replace jquery.min.js
---
 debian/changelog |  9 ++++-----
 debian/control   |  6 ++++--
 debian/copyright | 29 ++++++++++++++++++++++++++++-
 debian/rules     | 14 ++++++++++++++
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2738315..7720ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
 r-cran-rhandsontable (0.3.4+dfsg-1) UNRELEASED; urgency=medium
 
   * Initial release (closes: #xxxxxx)
-TODO
-E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/chroma/chroma.min.js
-E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/handsontable/handsontable.full.min.js
-E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/jquery/jquery.min.js
-E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/sparkline/jquery.sparkline.min.js
+  TODO
+  E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/chroma/chroma.min.js
+  E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/handsontable/handsontable.full.min.js
+  E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/sparkline/jquery.sparkline.min.js
 
  -- Andreas Tille <tille at debian.org>  Tue, 10 Oct 2017 22:58:51 +0200
diff --git a/debian/control b/debian/control
index ad30eb1..80aebad 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 10),
                r-base-dev,
                r-cran-jsonlite,
                r-cran-htmlwidgets,
-               r-cran-magrittr
+               r-cran-magrittr,
+               libjs-jquery
 Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/git/debian-med/r-cran-rhandsontable.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/r-cran-rhandsontable.git
@@ -18,7 +19,8 @@ Package: r-cran-rhandsontable
 Architecture: all
 Depends: ${R:Depends},
          ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         libjs-jquery
 Recommends: ${R:Recommends}
 Suggests: ${R:Suggests}
 Description: Interface to the 'Handsontable.js' Library
diff --git a/debian/copyright b/debian/copyright
index ad24056..ed12bae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,13 +7,40 @@ Files-Excluded: */jquery.min.js
 TODO
 E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/chroma/chroma.min.js
 E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/handsontable/handsontable.full.min.js
-E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/jquery/jquery.min.js
 E: r-cran-rhandsontable source: source-is-missing inst/htmlwidgets/lib/sparkline/jquery.sparkline.min.js
 
 Files: *
 Copyright: Jonathan Owen, Jeff Allen, Yihui Xie, et all
 License: MIT
 
+Files: inst/htmlwidgets/lib/chroma/chroma.js
+Copyright: 2011-2015, Gregor Aisch
+Comment: JavaScript library for color conversions
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ .
+ 2. 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.
+ .
+ 3. The name Gregor Aisch may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 GREGOR AISCH OR 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.
+
 Files: debian/*
 Copyright: 2017 Andreas Tille <tille at debian.org>
 License: MIT
diff --git a/debian/rules b/debian/rules
index 529c38a..0ea6d9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,19 @@
 #!/usr/bin/make -f
 
+# These definitions can be removed once #842092 is fixed
+include /usr/share/dpkg/default.mk
+debRreposname   := $(shell echo $(DEB_SOURCE) | sed 's/r-\([a-z]\+\)-.*/\1/')
+awkString       := "'/^(Package|Bundle):/ {print $$2 }'"
+cranNameOrig    := $(shell awk "$(awkString)" DESCRIPTION)
+cranName        := $(shell echo "$(cranNameOrig)" | tr A-Z a-z)
+package         := r-$(debRreposname)-$(cranName)
+debRdir         := usr/lib/R/site-library
+debRlib         := $(CURDIR)/debian/$(package)/$(debRdir)
+
+
 %:
 	dh $@ --buildsystem R
 
+override_dh_link:
+	dh_link
+	ln -s usr/share/javascript/jquery/jquery.min.js $(debRlib)/$(cranNameOrig)/inst/htmlwidgets/lib/jquery/jquery.min.js

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

