[DRE-commits] [ruby-influxdb] 02/06: make lintian happy

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sat Jan 16 14:38:05 UTC 2016


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

praveen pushed a commit to branch master
in repository ruby-influxdb.

commit 0a06e75bfbf28fbf094d5144812f18ee8f531b2a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jan 16 18:36:57 2016 +0530

    make lintian happy
---
 debian/changelog                           |  4 +--
 debian/control                             |  7 +++--
 debian/copyright                           | 45 +++++++++++++----------------
 debian/patches/no-cause-for-ruby-2.1.patch | 46 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/ruby-tests.rake                     |  3 +-
 6 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92784c4..7c2ea47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 ruby-influxdb (0.2.3-1) UNRELEASED; urgency=medium
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #811173)
 
- -- Pirate Praveen <praveen at debian.org>  Sat, 16 Jan 2016 17:59:48 +0530
+ -- Pirate Praveen <praveen at debian.org>  Fri, 15 Jan 2016 13:16:45 +0530
diff --git a/debian/control b/debian/control
index 3736649..6e203b4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,5 +24,8 @@ Depends: ruby | ruby-interpreter,
          ruby-json,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: Ruby library for InfluxDB.
- This is the official Ruby library for InfluxDB.
+Description: library for InfluxDB
+ This is the official Ruby library for InfluxDB (https://influxdb.com/).
+ .
+ InfluxDB is an Open-Source, Distributed, Time Series Database. It is a
+ scalable datastore for metrics, events, and real-time analytics.
diff --git a/debian/copyright b/debian/copyright
index cc5b45c..d58ea29 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: influxdb
-Source: http://influxdb.org
+Source: https://rubygems.org/gems/influxdb
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2013 Todd Persen
+License: Expat
 
 Files: debian/*
 Copyright: 2016 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/patches/no-cause-for-ruby-2.1.patch b/debian/patches/no-cause-for-ruby-2.1.patch
new file mode 100644
index 0000000..243b6e1
--- /dev/null
+++ b/debian/patches/no-cause-for-ruby-2.1.patch
@@ -0,0 +1,46 @@
+Bug: https://github.com/influxdata/influxdb-ruby/issues/126
+
+Index: ruby-influxdb-0.2.3/influxdb.gemspec
+===================================================================
+--- ruby-influxdb-0.2.3.orig/influxdb.gemspec
++++ ruby-influxdb-0.2.3/influxdb.gemspec
+@@ -19,10 +19,13 @@ Gem::Specification.new do |spec|
+   spec.require_paths = ["lib"]
+ 
+   spec.add_runtime_dependency "json"
+-  spec.add_runtime_dependency "cause"
+ 
+   spec.add_development_dependency "bundler", "~> 1.3"
+   spec.add_development_dependency "rake"
+   spec.add_development_dependency "rspec", "~> 3.0.0"
+   spec.add_development_dependency "webmock", "~> 1.21.0"
++
++  if RUBY_VERSION < '2.1'
++    spec.add_runtime_dependency "cause"
++  end
+ end
+Index: ruby-influxdb-0.2.3/metadata.yml
+===================================================================
+--- ruby-influxdb-0.2.3.orig/metadata.yml
++++ ruby-influxdb-0.2.3/metadata.yml
+@@ -25,20 +25,6 @@ dependencies:
+       - !ruby/object:Gem::Version
+         version: '0'
+ - !ruby/object:Gem::Dependency
+-  name: cause
+-  requirement: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - ">="
+-      - !ruby/object:Gem::Version
+-        version: '0'
+-  type: :runtime
+-  prerelease: false
+-  version_requirements: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - ">="
+-      - !ruby/object:Gem::Version
+-        version: '0'
+-- !ruby/object:Gem::Dependency
+   name: bundler
+   requirement: !ruby/object:Gem::Requirement
+     requirements:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..112f4df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-cause-for-ruby-2.1.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index cf1591e..9364673 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,6 @@
 require 'gem2deb/rake/spectask'
 
 Gem2Deb::Rake::RSpecTask.new do |spec|
-  spec.pattern = './spec/**/*_spec.rb'
+# Needs Webmock >= 1.21.0 https://gitlab.com/debian-ruby/TaskTracker/issues/76
+  spec.pattern = FileList['./spec/**/*_spec.rb'] - FileList['./spec/influxdb/cases/async_client_spec.rb']
 end

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



More information about the Pkg-ruby-extras-commits mailing list