[DRE-commits] [ruby-licensee] 02/02: make lintian clean
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Wed Jun 1 14:40: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-licensee.
commit 313cac750807ad7537415a586bc4dfd8655332df
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed Jun 1 19:45:47 2016 +0530
make lintian clean
---
debian/changelog | 6 ++--
debian/control | 9 +++---
debian/copyright | 45 +++++++++++++---------------
debian/patches/remove-rubygems-bundler.patch | 22 ++++++++++++++
debian/patches/series | 1 +
debian/ruby-tests.rake | 2 +-
debian/rules | 4 +++
7 files changed, 56 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b85d291..f6e869c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-licensee (8.0.0-1) UNRELEASED; urgency=medium
+ruby-licensee (8.0.0-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #826016)
- -- Pirate Praveen <praveen at debian.org> Wed, 01 Jun 2016 19:38:17 +0530
+ -- Pirate Praveen <praveen at debian.org> Wed, 01 Jun 2016 19:45:34 +0530
diff --git a/debian/control b/debian/control
index 4b77cdf..2bbe811 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders: Pirate Praveen <praveen at debian.org>
Build-Depends: debhelper (>= 9~),
gem2deb,
rake,
- ruby-rugged (>= 0.24b)
-Standards-Version: 3.9.7
+ ruby-rugged (>= 0.24~b),
+ ruby-shoulda
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-licensee.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-licensee.git
Homepage: https://github.com/benbalter/licensee
@@ -18,9 +19,9 @@ Package: ruby-licensee
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
- ruby-rugged (>= 0.24b),
+ ruby-rugged (>= 0.24~b),
${misc:Depends},
${shlibs:Depends}
-Description: A Ruby Gem to detect open source project licenses
+Description: program to detect open source project licenses
Licensee automates the process of reading LICENSE files and
compares their contents to known licenses using a fancy maths.
diff --git a/debian/copyright b/debian/copyright
index 706ff98..a8210e5 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: licensee
-Source: https://github.com/benbalter/licensee
+Source: https://rubygems.org/gems/licensee
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2014-2015 Ben Balter
+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/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
new file mode 100644
index 0000000..d5e99c9
--- /dev/null
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -0,0 +1,22 @@
+remove rubygems and bundler
+
+Index: ruby-licensee-8.0.0/test/helper.rb
+===================================================================
+--- ruby-licensee-8.0.0.orig/test/helper.rb
++++ ruby-licensee-8.0.0/test/helper.rb
+@@ -1,10 +1,12 @@
+-require 'rubygems'
+-require 'bundler'
++#require 'rubygems'
++#require 'bundler'
+ require 'minitest/autorun'
+ require 'shoulda'
+ require 'open3'
+ require_relative 'functions'
+-require_relative '../lib/licensee'
++
++$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
++require 'licensee'
+
+ def assert_license_content(expected, readme)
+ content = Licensee::Project::Readme.license_content(readme)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..005fb51
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-rubygems-bundler.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 63f3fd6..d98a02a 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -2,5 +2,5 @@ require 'gem2deb/rake/testtask'
Gem2Deb::Rake::TestTask.new do |t|
t.libs = ['test']
- t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+ t.test_files = FileList['test/**/test_*.rb'] - FileList['test/test_licensee_gemspec_matcher.rb','test/test_licensee_bin.rb','test/test_licensee_project.rb']
end
diff --git a/debian/rules b/debian/rules
index 3454d59..b861a25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,7 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+ # use utf-8 locale so test cases work
+ LC_ALL=C.UTF-8 dh_auto_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-licensee.git
More information about the Pkg-ruby-extras-commits
mailing list