[DRE-commits] [ruby-hamster] 02/02: Debian: Initial packaging, fixing lintian complaints
Hanno Zulla
hanno-guest at moszumanska.debian.org
Mon Jan 18 15:04:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
hanno-guest pushed a commit to branch master
in repository ruby-hamster.
commit 9a0117cae8d2e1e43b23fe2512203ed3bcf71914
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date: Mon Jan 18 16:03:53 2016 +0100
Debian: Initial packaging, fixing lintian complaints
---
debian/changelog | 4 +--
debian/control | 12 ++++++---
debian/copyright | 36 ++++++++++++++++++++-----
debian/patches/01-remove-code-climate.patch | 16 +++++++++++
debian/patches/02-concurrent-ruby.patch | 42 +++++++++++++++++++++++++++++
debian/patches/series | 2 ++
6 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4fd8fe9..5cbc5b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
ruby-hamster (2.0.0-1) UNRELEASED; urgency=medium
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #811390)
- -- Hanno Zulla <hanno at esprimo> Mon, 18 Jan 2016 15:58:51 +0100
+ -- Hanno Zulla <kontakt at hanno.de> Mon, 18 Jan 2016 15:50:00 +0100
diff --git a/debian/control b/debian/control
index e65f86b..588fdda 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders: <>
Build-Depends: debhelper (>= 9~),
gem2deb,
rake,
- ruby-concurrent (>= 0.8),
- ruby-rspec
+ ruby-concurrent (>= 1.0),
+ ruby-rspec,
+ pry
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-hamster.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-hamster.git
@@ -19,8 +20,11 @@ Package: ruby-hamster
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
- ruby-concurrent (>= 0.8),
+ ruby-concurrent (>= 1.0),
${misc:Depends},
${shlibs:Depends}
Description: Efficient, immutable, thread-safe collection classes for Ruby
- Efficient, immutable, thread-safe collection classes for Ruby
+ Hamster collections are immutable. Whenever you modify a Hamster
+ collection, the original is preserved and a modified copy is
+ returned. This makes them inherently thread-safe and sharable.
+
diff --git a/debian/copyright b/debian/copyright
index 852db37..abe69fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,38 @@ Upstream-Name: hamster
Source: https://github.com/hamstergem/hamster
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2009-2010 Simon Harris
+ 2010-2016 Kurtis Rainbolt-Greene
+License: Expat
Files: debian/*
-Copyright: 2016 <>
-License: GPL-2+ (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+Copyright: 2016 Hanno Zulla <kontakt at hanno.de>
+License: GPL-2.0+
-License: GPL-2+ (FIXME)
+
+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:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ 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.
+
+License: GPL-2.0+
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
diff --git a/debian/patches/01-remove-code-climate.patch b/debian/patches/01-remove-code-climate.patch
new file mode 100644
index 0000000..d2cb774
--- /dev/null
+++ b/debian/patches/01-remove-code-climate.patch
@@ -0,0 +1,16 @@
+Description: Remove CodeClimate test for Debian build
+Forwarded: no
+Author: Hanno Zulla <kontakt at hanno.de>
+Last-Update: 2016-01-18
+
+Index: ruby-hamster-2.0.0/spec/spec_helper.rb
+===================================================================
+--- ruby-hamster-2.0.0.orig/spec/spec_helper.rb 2016-01-18 14:19:14.000000000 +0100
++++ ruby-hamster-2.0.0/spec/spec_helper.rb 2016-01-18 14:20:08.164992506 +0100
+@@ -1,6 +1,3 @@
+-require "codeclimate-test-reporter"
+-CodeClimate::TestReporter.start
+-
+ require "pry"
+ require "rspec"
+ require "hamster/hash"
diff --git a/debian/patches/02-concurrent-ruby.patch b/debian/patches/02-concurrent-ruby.patch
new file mode 100644
index 0000000..b37e0e9
--- /dev/null
+++ b/debian/patches/02-concurrent-ruby.patch
@@ -0,0 +1,42 @@
+Description: Update to concurrent ruby 1.0's updated API
+ The current release of Hamster is using an outdated version
+ of concurrent-ruby. Since the release, Hamster upstream has
+ already fixed this in git commit 74e8944 on 2015-12-02,
+ but hasn't released this fix yet.
+Forwarded: no
+Author: Hanno Zulla <kontakt at hanno.de>
+Last-Update: 2016-01-18
+
+Index: ruby-hamster-2.0.0/lib/hamster/list.rb
+===================================================================
+--- ruby-hamster-2.0.0.orig/lib/hamster/list.rb 2016-01-18 15:03:35.000000000 +0100
++++ ruby-hamster-2.0.0/lib/hamster/list.rb 2016-01-18 15:23:44.345592384 +0100
+@@ -1311,7 +1311,7 @@
+ def initialize(&block)
+ @head = block # doubles as storage for block while yet unrealized
+ @tail = nil
+- @atomic = Concurrent::Atomic.new(0) # haven't yet run block
++ @atomic = Concurrent::AtomicReference.new(0) # haven't yet run block
+ @size = nil
+ end
+
+Index: ruby-hamster-2.0.0/spec/lib/hamster/list/multithreading_spec.rb
+===================================================================
+--- ruby-hamster-2.0.0.orig/spec/lib/hamster/list/multithreading_spec.rb 2016-01-18 15:03:35.000000000 +0100
++++ ruby-hamster-2.0.0/spec/lib/hamster/list/multithreading_spec.rb 2016-01-18 15:23:50.621550726 +0100
+@@ -4,7 +4,7 @@
+
+ describe Hamster::List do
+ it "ensures each node of a lazy list will only be realized on ONE thread, even when accessed by multiple threads" do
+- counter = Concurrent::Atomic.new(0)
++ counter = Concurrent::AtomicReference.new(0)
+ list = (1..10000).to_list.map { |x| counter.update { |count| count + 1 }; x * 2 }
+
+ threads = 10.times.collect do
+@@ -45,4 +45,4 @@
+ elapsed = Time.now - start
+ elapsed.should_not > 0.3
+ end
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c0a996e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+02-concurrent-ruby.patch
+01-remove-code-climate.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hamster.git
More information about the Pkg-ruby-extras-commits
mailing list