[DRE-commits] [ruby-swd] 02/02: make lintian happy
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Jul 3 17:15:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-swd.
commit dcae667e46a3a33cfcb4b6f08d5bf68ba5b78766
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sun Jul 3 22:39:44 2016 +0530
make lintian happy
---
debian/changelog | 6 ++--
debian/control | 10 +++++--
debian/copyright | 46 ++++++++++++++-----------------
debian/patches/001-fix-version.patch | 39 ++++++++++++++++++++++++++
debian/patches/002-remove-simplecov.patch | 24 ++++++++++++++++
debian/patches/series | 2 ++
debian/rules | 10 +++++++
7 files changed, 106 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 701e9a6..5012123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-swd (1.0.1-1) UNRELEASED; urgency=medium
+ruby-swd (1.0.1-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #829368)
- -- Pirate Praveen <praveen at debian.org> Sun, 03 Jul 2016 01:16:59 +0530
+ -- Pirate Praveen <praveen at debian.org> Sun, 03 Jul 2016 22:39:17 +0530
diff --git a/debian/control b/debian/control
index f551830..473f10d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,10 @@ Build-Depends: debhelper (>= 9~),
ruby-httpclient (>= 2.4),
ruby-i18n,
ruby-json (>= 1.4.3),
- ruby-rspec
-Standards-Version: 3.9.7
+ ruby-rspec,
+ ruby-rspec-its,
+ ruby-webmock
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-swd.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-swd.git
Homepage: https://github.com/nov/swd
@@ -31,4 +33,6 @@ Depends: ruby | ruby-interpreter,
${misc:Depends},
${shlibs:Depends}
Description: SWD (Simple Web Discovery) Client Library
- SWD (Simple Web Discovery) Client Library
+ SWD was designed to be the core of OpenID Connect Discovery, but it's replaced
+ with WebFinger. So using this as a standalone library is not supported, it is
+ used only for OP Config discovery with 'openid_connect'.
diff --git a/debian/copyright b/debian/copyright
index 3034eb5..cfd1eaf 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: swd
-Source: https://github.com/nov/swd
+Source: http://rubygems.org/gems/swd
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2012 nov matake
+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-fix-version.patch b/debian/patches/001-fix-version.patch
new file mode 100644
index 0000000..6b31af1
--- /dev/null
+++ b/debian/patches/001-fix-version.patch
@@ -0,0 +1,39 @@
+Index: ruby-swd/lib/swd.rb
+===================================================================
+--- ruby-swd.orig/lib/swd.rb
++++ ruby-swd/lib/swd.rb
+@@ -9,7 +9,7 @@ require 'attr_optional'
+
+ module SWD
+ VERSION = ::File.read(
+- ::File.join(::File.dirname(__FILE__), '../VERSION')
++ ::File.join(::File.dirname(__FILE__), '/VERSION')
+ )
+
+ def self.cache=(cache)
+@@ -76,4 +76,4 @@ require 'swd/resource'
+ require 'swd/response'
+ require 'swd/debugger'
+
+-SWD.cache = SWD::Cache.new
+\ No newline at end of file
++SWD.cache = SWD::Cache.new
+Index: ruby-swd/swd.gemspec
+===================================================================
+--- ruby-swd.orig/swd.gemspec
++++ ruby-swd/swd.gemspec
+@@ -1,6 +1,6 @@
+ Gem::Specification.new do |s|
+ s.name = "swd"
+- s.version = File.read("VERSION")
++ s.version = File.read("lib/VERSION")
+ s.authors = ["nov matake"]
+ s.email = ["nov at matake.jp"]
+ s.homepage = "https://github.com/nov/swd"
+@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
+ s.add_development_dependency 'rspec-its'
+ s.add_development_dependency "webmock"
+ s.add_development_dependency 'simplecov'
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/002-remove-simplecov.patch b/debian/patches/002-remove-simplecov.patch
new file mode 100644
index 0000000..9d3d573
--- /dev/null
+++ b/debian/patches/002-remove-simplecov.patch
@@ -0,0 +1,24 @@
+Index: ruby-swd/spec/spec_helper.rb
+===================================================================
+--- ruby-swd.orig/spec/spec_helper.rb
++++ ruby-swd/spec/spec_helper.rb
+@@ -1,8 +1,8 @@
+-require 'simplecov'
++#require 'simplecov'
+
+-SimpleCov.start do
+- add_filter 'spec'
+-end
++#SimpleCov.start do
++# add_filter 'spec'
++#end
+
+ require 'rspec'
+ require 'rspec/its'
+@@ -14,4 +14,4 @@ RSpec.configure do |config|
+ end
+ end
+
+-require 'helpers/webmock_helper'
+\ No newline at end of file
++require 'helpers/webmock_helper'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..39b9286
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+001-fix-version.patch
+002-remove-simplecov.patch
diff --git a/debian/rules b/debian/rules
index 3454d59..8b8cfc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,13 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+ cp VERSION lib
+ dh_auto_install
+
+clean:
+ cp -f VERSION lib
+ dh_clean
+ rm -rf coverage
+ rm -rf lib/VERSION
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-swd.git
More information about the Pkg-ruby-extras-commits
mailing list