New Upstream Release - ruby-packable
Ready changes
Summary
Merged new upstream version: 1.3.17 (was: 1.3.15).
Resulting package
Built on 2023-05-21T05:51 (took 5m47s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases ruby-packable
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index 6a326d3..2bfaccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-packable (1.3.17-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Drop patch fix-ruby-3.0-argumenterror.patch, present upstream.
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 21 May 2023 05:45:52 -0000
+
ruby-packable (1.3.14-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/deprecated-fixnum.patch b/debian/patches/deprecated-fixnum.patch
index f8d091d..4ac645c 100644
--- a/debian/patches/deprecated-fixnum.patch
+++ b/debian/patches/deprecated-fixnum.patch
@@ -13,10 +13,10 @@ Forwarded: https://github.com/marcandre/packable/pull/14
test/packing_test.rb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
-diff --git a/test/packing_test.rb b/test/packing_test.rb
-index 007f8e4..0ac7070 100644
---- a/test/packing_test.rb
-+++ b/test/packing_test.rb
+Index: ruby-packable.git/test/packing_test.rb
+===================================================================
+--- ruby-packable.git.orig/test/packing_test.rb
++++ ruby-packable.git/test/packing_test.rb
@@ -55,7 +55,6 @@ class TestingPack < Minitest::Test
assert_equal 1.pack(:long), ((1 << 69) + 1).pack(:long)
assert_equal "*" + ("\000" * 15), (42 << (8*15)).pack(:bytes => 16)
diff --git a/debian/patches/fix-ruby-3.0-argumenterror.patch b/debian/patches/fix-ruby-3.0-argumenterror.patch
deleted file mode 100644
index 08049dc..0000000
--- a/debian/patches/fix-ruby-3.0-argumenterror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Daniel Leidert <dleidert@debian.org>
-Date: Thu, 25 Nov 2021 15:36:47 +0100
-Subject: Fix Ruby 3.0 ArgumentError
-
-Bug: https://github.com/marcandre/packable/issues/15
-Bug-Debian: https://bugs.debian.org/996345
-Forwarded: https://github.com/marcandre/packable/issues/15
----
- lib/packable/extensions/io.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/packable/extensions/io.rb b/lib/packable/extensions/io.rb
-index c8f7e89..75dd99f 100644
---- a/lib/packable/extensions/io.rb
-+++ b/lib/packable/extensions/io.rb
-@@ -73,7 +73,7 @@ module Packable
-
- def each_with_packing(*options, &block)
- return each_without_packing(*options, &block) if options.empty? || (Integer === options.first) || (String === options.first) || !seekable?
-- return Enumerator.new(self, :each_with_packing, *options) unless block_given?
-+ return self.to_enum(__method__, *options) unless block_given?
- yield read(*options) until eof?
- end
-
diff --git a/debian/patches/remove-git-from-gemfile.patch b/debian/patches/remove-git-from-gemfile.patch
index 5b385e5..e02f043 100644
--- a/debian/patches/remove-git-from-gemfile.patch
+++ b/debian/patches/remove-git-from-gemfile.patch
@@ -7,10 +7,10 @@ Forwarded: not-needed
packable.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/packable.gemspec b/packable.gemspec
-index 9d83da7..685fd9b 100644
---- a/packable.gemspec
-+++ b/packable.gemspec
+Index: ruby-packable.git/packable.gemspec
+===================================================================
+--- ruby-packable.git.orig/packable.gemspec
++++ ruby-packable.git/packable.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
gem.summary = %q{Extensive packing and unpacking capabilities}
gem.homepage = ""
diff --git a/debian/patches/remove_rubygems.patch b/debian/patches/remove_rubygems.patch
index 40098a7..0dbcc37 100644
--- a/debian/patches/remove_rubygems.patch
+++ b/debian/patches/remove_rubygems.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
test/test_helper.rb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index b300c07..61689da 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
+Index: ruby-packable.git/test/test_helper.rb
+===================================================================
+--- ruby-packable.git.orig/test/test_helper.rb
++++ ruby-packable.git/test/test_helper.rb
@@ -1,8 +1,7 @@
-require 'rubygems'
require 'minitest/autorun'
diff --git a/debian/patches/series b/debian/patches/series
index 13d812f..c674712 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
remove_rubygems.patch
remove-git-from-gemfile.patch
deprecated-fixnum.patch
-fix-ruby-3.0-argumenterror.patch
diff --git a/lib/packable.rb b/lib/packable.rb
index 46046af..a15e015 100644
--- a/lib/packable.rb
+++ b/lib/packable.rb
@@ -1,6 +1,4 @@
require "packable/version"
-require 'backports/tools/alias_method_chain'
-require 'backports/rails/module'
require_relative 'packable/packers'
require_relative 'packable/mixin'
[Object, Array, String, Integer, Float, IO, Proc].each do |klass|
diff --git a/lib/packable/extensions/array.rb b/lib/packable/extensions/array.rb
index e48e1d1..eb851ca 100644
--- a/lib/packable/extensions/array.rb
+++ b/lib/packable/extensions/array.rb
@@ -5,7 +5,8 @@ module Packable
module Array #:nodoc:
def self.included(base)
base.class_eval do
- alias_method_chain :pack, :long_form
+ alias_method :pack_without_long_form, :pack
+ alias_method :pack, :pack_with_long_form
include Packable
extend ClassMethods
end
diff --git a/lib/packable/extensions/io.rb b/lib/packable/extensions/io.rb
index c8f7e89..52b74da 100644
--- a/lib/packable/extensions/io.rb
+++ b/lib/packable/extensions/io.rb
@@ -5,9 +5,12 @@ module Packable
module Extensions #:nodoc:
module IO
def self.included(base) #:nodoc:
- base.alias_method_chain :read, :packing
- base.alias_method_chain :write, :packing
- base.alias_method_chain :each, :packing
+ base.__send__(:alias_method, :read_without_packing, :read)
+ base.__send__(:alias_method, :read, :read_with_packing)
+ base.__send__(:alias_method, :write_without_packing, :write)
+ base.__send__(:alias_method, :write, :write_with_packing)
+ base.__send__(:alias_method, :each_without_packing, :each)
+ base.__send__(:alias_method, :each, :each_with_packing)
end
# Methods supported by seekable streams.
@@ -73,7 +76,7 @@ module Packable
def each_with_packing(*options, &block)
return each_without_packing(*options, &block) if options.empty? || (Integer === options.first) || (String === options.first) || !seekable?
- return Enumerator.new(self, :each_with_packing, *options) unless block_given?
+ return self.to_enum(__method__, *options) unless block_given?
yield read(*options) until eof?
end
diff --git a/lib/packable/extensions/string.rb b/lib/packable/extensions/string.rb
index 2d4f4ea..8b89fe6 100644
--- a/lib/packable/extensions/string.rb
+++ b/lib/packable/extensions/string.rb
@@ -8,7 +8,8 @@ module Packable
base.class_eval do
include Packable
extend ClassMethods
- alias_method_chain :unpack, :long_form
+ alias_method :unpack_without_long_form, :unpack
+ alias_method :unpack, :unpack_with_long_form
packers.set :merge_all, :fill => " "
end
end
diff --git a/lib/packable/version.rb b/lib/packable/version.rb
index e6c0f2c..6c4b804 100644
--- a/lib/packable/version.rb
+++ b/lib/packable/version.rb
@@ -1,3 +1,3 @@
module Packable
- VERSION = "1.3.14"
+ VERSION = '1.3.17'
end
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/array.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/float.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/integer.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/io.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/object.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/proc.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/extensions/string.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/mixin.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/packers.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.17/lib/packable/version.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/specifications/packable-1.3.17.gemspec
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/array.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/float.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/integer.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/io.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/object.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/proc.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/extensions/string.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/mixin.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/packers.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/packable-1.3.14/lib/packable/version.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/specifications/packable-1.3.14.gemspec
No differences were encountered in the control files