[DRE-commits] [ruby-gitlab-flowdock-git-hook] 02/02: make lintian happy
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Fri Dec 11 18:09:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-gitlab-flowdock-git-hook.
commit 70a799af6aaccb3d4eee5144f108ec3431c5b2c7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Fri Dec 11 23:37:57 2015 +0530
make lintian happy
---
debian/changelog | 6 ++--
debian/control | 11 ++++---
debian/copyright | 45 +++++++++++--------------
debian/patches/series | 1 +
debian/patches/use-debian-grit.patch | 64 ++++++++++++++++++++++++++++++++++++
debian/ruby-tests.rake | 5 ---
6 files changed, 95 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8234817..8ae3c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-gitlab-flowdock-git-hook (1.0.1-1) UNRELEASED; urgency=medium
+ruby-gitlab-flowdock-git-hook (1.0.1-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #807697)
- -- Pirate Praveen <praveen at debian.org> Fri, 11 Dec 2015 23:33:16 +0530
+ -- Pirate Praveen <praveen at debian.org> Fri, 11 Dec 2015 23:37:23 +0530
diff --git a/debian/control b/debian/control
index 8b71f06..37f65c7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9~),
gem2deb,
rake,
ruby-flowdock (>= 0.7),
- ruby-gitlab-grit (>= 2.4.1),
+ ruby-grit (>= 2.4.1),
ruby-multi-json,
ruby-rspec
Standards-Version: 3.9.6
@@ -22,9 +22,12 @@ Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
ruby-flowdock (>= 0.7),
- ruby-gitlab-grit (>= 2.4.1),
+ ruby-grit (>= 2.4.1),
ruby-multi-json,
${misc:Depends},
${shlibs:Depends}
-Description: Git Post-Receive hook for Flowdock. Gem requirements patched for use with Gitlab.
- <insert long description, indented with spaces>
+Description: Git Post-Receive hook for Flowdock
+ Gem requirements patched for use with Gitlab.
+ .
+ This version depends on grit instead of gitlab-grit as Debian already include
+ gitlab patches in ruby-grit.
diff --git a/debian/copyright b/debian/copyright
index 6fa6eb0..46f20b3 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: gitlab-flowdock-git-hook
-Source: http://github.com/bladealslayer/flowdock-git-hook
+Source: https://rubygems.org/gems/gitlab-flowdock-git-hook
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2011 Flowdock Ltd.
+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/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b79ba23
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-debian-grit.patch
diff --git a/debian/patches/use-debian-grit.patch b/debian/patches/use-debian-grit.patch
new file mode 100644
index 0000000..61d5514
--- /dev/null
+++ b/debian/patches/use-debian-grit.patch
@@ -0,0 +1,64 @@
+Index: ruby-gitlab-flowdock-git-hook-1.0.1/gitlab-flowdock-git-hook.gemspec
+===================================================================
+--- ruby-gitlab-flowdock-git-hook-1.0.1.orig/gitlab-flowdock-git-hook.gemspec
++++ ruby-gitlab-flowdock-git-hook-1.0.1/gitlab-flowdock-git-hook.gemspec
+@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
+ s.specification_version = 4
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+- s.add_runtime_dependency(%q<gitlab-grit>, [">= 2.4.1"])
++ s.add_runtime_dependency(%q<grit>, [">= 2.4.1"])
+ s.add_runtime_dependency(%q<multi_json>, [">= 0"])
+ s.add_runtime_dependency(%q<flowdock>, ["~> 0.7"])
+ s.add_development_dependency(%q<byebug>, [">= 0"])
+@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
+ s.add_development_dependency(%q<webmock>, [">= 1.6.4"])
+ s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
+ else
+- s.add_dependency(%q<gitlab-grit>, [">= 2.4.1"])
++ s.add_dependency(%q<grit>, [">= 2.4.1"])
+ s.add_dependency(%q<multi_json>, [">= 0"])
+ s.add_dependency(%q<flowdock>, ["~> 0.7"])
+ s.add_dependency(%q<byebug>, [">= 0"])
+@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<jruby-openssl>, [">= 0"])
+ end
+ else
+- s.add_dependency(%q<gitlab-grit>, [">= 2.4.1"])
++ s.add_dependency(%q<grit>, [">= 2.4.1"])
+ s.add_dependency(%q<multi_json>, [">= 0"])
+ s.add_dependency(%q<flowdock>, ["~> 0.7"])
+ s.add_dependency(%q<byebug>, [">= 0"])
+Index: ruby-gitlab-flowdock-git-hook-1.0.1/metadata.yml
+===================================================================
+--- ruby-gitlab-flowdock-git-hook-1.0.1.orig/metadata.yml
++++ ruby-gitlab-flowdock-git-hook-1.0.1/metadata.yml
+@@ -12,7 +12,7 @@ cert_chain: []
+ date: 2015-08-13 00:00:00.000000000 Z
+ dependencies:
+ - !ruby/object:Gem::Dependency
+- name: gitlab-grit
++ name: grit
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - '>='
+Index: ruby-gitlab-flowdock-git-hook-1.0.1/Gemfile
+===================================================================
+--- ruby-gitlab-flowdock-git-hook-1.0.1.orig/Gemfile
++++ ruby-gitlab-flowdock-git-hook-1.0.1/Gemfile
+@@ -1,14 +1,5 @@
+ source "http://rubygems.org"
+
+-gem "gitlab-grit", ">= 2.4.1"
++gem "grit", ">= 2.4.1"
+ gem "multi_json"
+ gem "flowdock", "~> 0.7"
+-group :development do
+- gem "byebug"
+- gem "rdoc", ">= 2.4.2"
+- gem "rspec", "~> 2.8"
+- gem "bundler", "~> 1.0"
+- gem "jeweler", "~> 1.8.7"
+- gem "webmock", ">= 1.6.4"
+- gem "jruby-openssl", :platforms => :jruby, :require => false
+-end
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
deleted file mode 100644
index cf1591e..0000000
--- a/debian/ruby-tests.rake
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'gem2deb/rake/spectask'
-
-Gem2Deb::Rake::RSpecTask.new do |spec|
- spec.pattern = './spec/**/*_spec.rb'
-end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gitlab-flowdock-git-hook.git
More information about the Pkg-ruby-extras-commits
mailing list