[DRE-commits] [ruby-chronic-duration] 02/02: make lintian happy
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Fri Jun 17 15:23:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-chronic-duration.
commit 10b1a9ec58d7216d907ba5e7973833586ab0acbb
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Fri Jun 17 20:52:00 2016 +0530
make lintian happy
---
debian/changelog | 4 +--
debian/control | 10 ++++--
debian/copyright | 46 +++++++++++-------------
debian/patches/001-remove-rubygems-bundler.patch | 14 ++++++++
debian/patches/002-skip-rspec2-syntax.patch | 20 +++++++++++
debian/patches/series | 2 ++
6 files changed, 66 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d06995c..33fd8fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-chronic-duration (0.10.6-1) UNRELEASED; urgency=medium
+ruby-chronic-duration (0.10.6-1) unstable; urgency=medium
* Initial release (Closes: #827520)
- -- Pirate Praveen <praveen at debian.org> Fri, 17 Jun 2016 20:23:50 +0530
+ -- Pirate Praveen <praveen at debian.org> Fri, 17 Jun 2016 20:50:16 +0530
diff --git a/debian/control b/debian/control
index dcc16fa..28d4276 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9~),
rake,
ruby-numerizer (>= 0.1.1),
ruby-rspec
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-chronic-duration.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-chronic-duration.git
Homepage: https://github.com/hpoydar/chronic_duration
@@ -22,5 +22,9 @@ Depends: ruby | ruby-interpreter,
ruby-numerizer (>= 0.1.1),
${misc:Depends},
${shlibs:Depends}
-Description: A simple Ruby natural language parser for elapsed time
- A simple Ruby natural language parser for elapsed time. (For example, 4 hours and 30 minutes, 6 minutes 4 seconds, 3 days, etc.) Returns all results in seconds. Will return an integer unless you get tricky and need a float. (4 minutes and 13.47 seconds, for example.) The reverse can also be performed via the output method.
+Description: simple Ruby natural language parser for elapsed time
+ A simple Ruby natural language parser for elapsed time. (For example, 4 hours
+ and 30 minutes, 6 minutes 4 seconds, 3 days, etc.) Returns all results in
+ seconds. Will return an integer unless you get tricky and need a float. (4
+ minutes and 13.47 seconds, for example.) The reverse can also be performed
+ via the output method.
diff --git a/debian/copyright b/debian/copyright
index e976123..e3d5721 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,31 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: chronic_duration
-Source: https://github.com/hpoydar/chronic_duration
+Source: https://rubygems.org/gems/chronic_duration
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: Henry Poydar
+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/001-remove-rubygems-bundler.patch b/debian/patches/001-remove-rubygems-bundler.patch
new file mode 100644
index 0000000..2260f85
--- /dev/null
+++ b/debian/patches/001-remove-rubygems-bundler.patch
@@ -0,0 +1,14 @@
+disable rubygems and bundler
+
+Index: ruby-chronic-duration-0.10.6/spec/spec_helper.rb
+===================================================================
+--- ruby-chronic-duration-0.10.6.orig/spec/spec_helper.rb
++++ ruby-chronic-duration-0.10.6/spec/spec_helper.rb
+@@ -1,5 +1,5 @@
+-require 'rubygems'
+-require 'bundler/setup'
++#require 'rubygems'
++#require 'bundler/setup'
+ require 'chronic_duration'
+
+ RSpec.configure do |config|
diff --git a/debian/patches/002-skip-rspec2-syntax.patch b/debian/patches/002-skip-rspec2-syntax.patch
new file mode 100644
index 0000000..bd30c97
--- /dev/null
+++ b/debian/patches/002-skip-rspec2-syntax.patch
@@ -0,0 +1,20 @@
+skip tests using deprecated syntax
+
+Index: ruby-chronic-duration-0.10.6/spec/lib/chronic_duration_spec.rb
+===================================================================
+--- ruby-chronic-duration-0.10.6.orig/spec/lib/chronic_duration_spec.rb
++++ ruby-chronic-duration-0.10.6/spec/lib/chronic_duration_spec.rb
+@@ -57,11 +57,11 @@ describe ChronicDuration do
+ ChronicDuration.parse('0', :keep_zero => true).should == 0
+ end
+
+- it "should return a float if seconds are in decimals" do
++ xit "should return a float if seconds are in decimals" do
+ ChronicDuration.parse('12 mins 3.141 seconds').is_a?(Float).should be_true
+ end
+
+- it "should return an integer unless the seconds are in decimals" do
++ xit "should return an integer unless the seconds are in decimals" do
+ ChronicDuration.parse('12 mins 3 seconds').is_a?(Integer).should be_true
+ end
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3b07359
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+001-remove-rubygems-bundler.patch
+002-skip-rspec2-syntax.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-chronic-duration.git
More information about the Pkg-ruby-extras-commits
mailing list