[DRE-commits] [ruby-rails-assets-chartjs] 02/02: make lintian happy

Mon Dec 14 10:08:57 UTC 2015

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

praveen pushed a commit to branch master
in repository ruby-rails-assets-chartjs.

commit 01b403a6dd378c40e25b79316afcebade91eda31
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Dec 14 15:31:25 2015 +0530

    make lintian happy
---
 debian/changelog                       |  6 ++---
 debian/control                         | 18 +++++++++++++-
 debian/copyright                       | 45 +++++++++++++++-------------------
 debian/install                         |  1 +
 debian/libjs-chartjs.install           |  2 ++
 debian/patches/engine-root.patch       | 12 +++++++++
 debian/patches/remove-jquery.patch     | 26 ++++++++++++++++++++
 debian/patches/series                  |  2 ++
 debian/ruby-rails-assets-chartjs.links |  1 +
 debian/source/lintian-overrides        |  6 +++++
 debian/tests/control                   |  2 ++
 debian/tests/smoke-test                | 15 ++++++++++++
 12 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa8c1b8..4acf638 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-rails-assets-chartjs (1.0.2-1) UNRELEASED; urgency=medium
+ruby-rails-assets-chartjs (1.0.2-1) unstable; urgency=medium
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #807897)
 
- -- Pirate Praveen <praveen at debian.org>  Mon, 14 Dec 2015 15:26:22 +0530
+ -- Pirate Praveen <praveen at debian.org>  Mon, 14 Dec 2015 15:31:01 +0530
diff --git a/debian/control b/debian/control
index b758506..129762f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,23 @@ Package: ruby-rails-assets-chartjs
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
+         libjs-chartjs (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Description: provide Chart.js via rails assets pipeline
+ Simple HTML5 Charts using the canvas element.  It supports line charts, bar
+ charts, radar charts, polar area charts, pie & doughnut charts.
+ .
+ Everything you need to know to build great looking charts using Chart.js is
+ available at http://www.chartjs.org/docs/
+
+Package: libjs-chartjs
+Section: web
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Simple HTML5 Charts using the canvas element
- Simple HTML5 Charts using the canvas element
+ It supports line charts, bar  charts, radar charts, polar area charts, pie &
+ doughnut charts.
+ .
+ Everything you need to know to build great looking charts using Chart.js is
+ available at http://www.chartjs.org/docs/
diff --git a/debian/copyright b/debian/copyright
index 4eaa5c4..6c09e0b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,30 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rails-assets-chartjs
-Source: https://github.com/nnnick/Chart.js
+Source: https://rails-assets.org
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2015 Nick Downie
+License: Expat
 
 Files: debian/*
 Copyright: 2015 Pirate Praveen <praveen at debian.org>
-License: GPL-2+ (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+License: Expat
 
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+License: Expat
+ 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:
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ 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.
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..36289f8
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+app usr/share/ruby-rails-assets-chartjs
diff --git a/debian/libjs-chartjs.install b/debian/libjs-chartjs.install
new file mode 100644
index 0000000..7318a0c
--- /dev/null
+++ b/debian/libjs-chartjs.install
@@ -0,0 +1,2 @@
+app/assets/javascripts/chartjs/Chart.js usr/share/javascript/chartjs
+app/assets/javascripts/chartjs/src/Chart.*.js usr/share/javascript/chartjs
diff --git a/debian/patches/engine-root.patch b/debian/patches/engine-root.patch
new file mode 100644
index 0000000..abead6a
--- /dev/null
+++ b/debian/patches/engine-root.patch
@@ -0,0 +1,12 @@
+Index: ruby-rails-assets-chartjs-1.0.2/lib/rails-assets-chartjs.rb
+===================================================================
+--- ruby-rails-assets-chartjs-1.0.2.orig/lib/rails-assets-chartjs.rb
++++ ruby-rails-assets-chartjs-1.0.2/lib/rails-assets-chartjs.rb
+@@ -25,6 +25,7 @@ module RailsAssetsChartjs
+ 
+   if defined?(Rails)
+     class Engine < ::Rails::Engine
++      config.root = '/usr/share/ruby-rails-assets-chartjs'
+       # Rails -> use app/assets directory.
+     end
+   end
diff --git a/debian/patches/remove-jquery.patch b/debian/patches/remove-jquery.patch
new file mode 100644
index 0000000..ffcdfab
--- /dev/null
+++ b/debian/patches/remove-jquery.patch
@@ -0,0 +1,26 @@
+Index: ruby-rails-assets-chartjs-1.0.2/app/assets/templates/chartjs/samples/line-customTooltips.html
+===================================================================
+--- ruby-rails-assets-chartjs-1.0.2.orig/app/assets/templates/chartjs/samples/line-customTooltips.html
++++ ruby-rails-assets-chartjs-1.0.2/app/assets/templates/chartjs/samples/line-customTooltips.html
+@@ -4,7 +4,7 @@
+ <head>
+     <title>Line Chart with Custom Tooltips</title>
+     <script src="../Chart.js"></script>
+-    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
++    <script src="file:///usr/share/javascript/jquery/jquery.min.js"></script>
+ 
+     <style>
+     #canvas-holder1 {
+Index: ruby-rails-assets-chartjs-1.0.2/app/assets/templates/chartjs/samples/pie-customTooltips.html
+===================================================================
+--- ruby-rails-assets-chartjs-1.0.2.orig/app/assets/templates/chartjs/samples/pie-customTooltips.html
++++ ruby-rails-assets-chartjs-1.0.2/app/assets/templates/chartjs/samples/pie-customTooltips.html
+@@ -4,7 +4,7 @@
+ <head>
+     <title>Pie Chart with Custom Tooltips</title>
+     <script src="../Chart.js"></script>
+-    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
++    <script src="file:///usr/share/javascript/jquery/jquery.min.js"></script>
+ 
+     <style>
+     #canvas-holder {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9f79b91
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+engine-root.patch
+remove-jquery.patch
diff --git a/debian/ruby-rails-assets-chartjs.links b/debian/ruby-rails-assets-chartjs.links
new file mode 100644
index 0000000..8b5757d
--- /dev/null
+++ b/debian/ruby-rails-assets-chartjs.links
@@ -0,0 +1 @@
+usr/share/javascript/chartjs/Chart.js usr/share/ruby-rails-assets-chartjs/app/assets/javascripts/chartjs/Chart.js
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..95d2faa
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,6 @@
+# False positives
+ruby-rails-assets-chartjs source: source-is-missing app/assets/javascripts/chartjs/src/Chart.Bar.js
+ruby-rails-assets-chartjs source: source-is-missing app/assets/javascripts/chartjs/src/Chart.Doughnut.js
+ruby-rails-assets-chartjs source: source-is-missing app/assets/javascripts/chartjs/src/Chart.Line.js
+ruby-rails-assets-chartjs source: source-is-missing app/assets/javascripts/chartjs/src/Chart.PolarArea.js
+ruby-rails-assets-chartjs source: source-is-missing app/assets/javascripts/chartjs/src/Chart.Radar.js
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..9918680
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: smoke-test
+Depends: @, rails, ruby-coffee-script, ruby-jbuilder
diff --git a/debian/tests/smoke-test b/debian/tests/smoke-test
new file mode 100644
index 0000000..1ca0931
--- /dev/null
+++ b/debian/tests/smoke-test
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+exec 2>&1
+set -ex
+
+cd $ADTTMP
+
+rails new foo
+cd foo
+
+echo "gem 'rails-assets-chartjs'" >> Gemfile
+echo '//= require chartjs' >> app/assets/javascripts/application.js
+
+bundle install --local
+bundle exec rake assets:precompile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-assets-chartjs.git

