New Upstream Release - ruby-bindata
Ready changes
Summary
Merged new upstream version: 2.4.15 (was: 2.4.14).
Resulting package
Built on 2023-05-22T17:23 (took 6m52s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases ruby-bindata
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 448f4df..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Gemfile.lock
-wiki
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1212c5d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: ruby
-rvm:
- - 2.2
- - 2.3
- - 2.4
- - 2.5
- - 2.6
- - 2.7
- - jruby
- - ruby-head
-
-matrix:
- allow_failures:
- - rvm: jruby
- - rvm: ruby-head
diff --git a/BSDL b/BSDL
deleted file mode 100644
index e61d19d..0000000
--- a/BSDL
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (C) 2007-2012 Dion Mendel. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 3a25c4f..0000000
--- a/COPYING
+++ /dev/null
@@ -1,52 +0,0 @@
-BinData is copyrighted free software by Dion Mendel <bindata@dm9.info>.
-You can redistribute it and/or modify it under either the terms of the
-2-clause BSDL (see the file BSDL), or the conditions below:
-
- 1. You may make and give away verbatim copies of the source form of the
- software without restriction, provided that you duplicate all of the
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
- b) use the modified software only within your corporation or
- organization.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or binary form,
- provided that you do at least ONE of the following:
-
- a) distribute the binaries and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
-
- b) accompany the distribution with the machine-readable source of
- the software.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 4. You may modify and include the part of the software into any other
- software (possibly commercial).
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
diff --git a/ChangeLog.rdoc b/ChangeLog.rdoc
index e1d604c..fc4449e 100644
--- a/ChangeLog.rdoc
+++ b/ChangeLog.rdoc
@@ -1,5 +1,14 @@
= BinData Changelog
+== Version 2.4.15 (2023-02-07)
+
+* Added ruby 2.4.0 requirement to gemspec. Thanks to theldoria.
+* Added github CI action. Thanks to Peter Goldstein.
+* Convert file from latin1 to UTF-8. Thanks to Cédric Boutillier.
+* Move license from dual license to solely BSD-2-Clause.
+* Remove unnecessary files from gem. Requested by Orien Madgwick.
+* Allow multiple calls to auto_call_delayed_io. Thanks to dwelch-r7.
+
== Version 2.4.14 (2022-10-31)
* Use Comparable#clamp instead of manual calculations.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 9102eee..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-This package is designed to be installed with rubygems.
-
- $ gem install bindata
-
-If you are using ruby 1.8
-
- $ gem install bindata -v '~> 1.8.0'
-
-If you are not using rubygems, you may like to install BinData with
-Minero Aoki's setup.rb found at:
-
- https://github.com/rubyworks/setup
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..991663e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2007-2022, Dion Mendel
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/NEWS.rdoc b/NEWS.rdoc
index 2786e17..411e3aa 100644
--- a/NEWS.rdoc
+++ b/NEWS.rdoc
@@ -1,3 +1,8 @@
+= 2.4.15
+
+This software was originally dual licensed under the Ruby license and the
+BSD-2-Clause license. It is now licensed solely as BSD-2-Clause.
+
= 2.4.0
This release changes the internal API for sanitizing parameters. This only
diff --git a/README.md b/README.md
index 61b6454..99990d9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
# What is BinData?
-[ ](https://rubygems.org/gems/bindata)
-[ ](https://travis-ci.org/dmendel/bindata)
-[ ](https://coveralls.io/r/dmendel/bindata)
+[ ](https://rubygems.org/gems/bindata)
+[ ](https://github.com/dmendel/bindata/actions/workflows/ci.yml)
+[ ](https://coveralls.io/r/dmendel/bindata)
Do you ever find yourself writing code like this?
diff --git a/bindata.gemspec b/bindata.gemspec
index 54efd77..0cb5e99 100644
--- a/bindata.gemspec
+++ b/bindata.gemspec
@@ -12,8 +12,13 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.extra_rdoc_files = ['NEWS.rdoc']
s.rdoc_options << '--main' << 'NEWS.rdoc'
- s.files = `git ls-files`.split("\n")
- s.license = 'Ruby'
+ s.files = Dir.chdir(__dir__) do
+ `git ls-files -z`.split("\x0").reject do |file|
+ file.start_with?(*%w[.git INSTALL])
+ end
+ end
+ s.license = 'BSD-2-Clause'
+ s.required_ruby_version = ">= 2.4.0"
s.add_development_dependency('rake')
s.add_development_dependency('minitest', "> 5.0.0", "< 5.12.0")
diff --git a/debian/changelog b/debian/changelog
index c516f62..980f99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-bindata (2.4.15-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Drop patch 0002-Convert-examples-NBT.txt-to-UTF-8.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 22 May 2023 17:16:44 -0000
+
ruby-bindata (2.4.14-1) unstable; urgency=medium
* Team upload
diff --git a/debian/patches/0002-Convert-examples-NBT.txt-to-UTF-8.patch b/debian/patches/0002-Convert-examples-NBT.txt-to-UTF-8.patch
deleted file mode 100644
index 7cfc924..0000000
--- a/debian/patches/0002-Convert-examples-NBT.txt-to-UTF-8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?C=C3=A9dric_Boutillier?= <boutil@debian.org>
-Date: Thu, 3 Nov 2022 11:39:56 +0100
-Subject: Convert examples/NBT.txt to UTF-8
-
-Forwarded: https://github.com/dmendel/bindata/pull/146
----
- examples/NBT.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/NBT.txt b/examples/NBT.txt
-index 7ed61ca..9b5bac2 100644
---- a/examples/NBT.txt
-+++ b/examples/NBT.txt
-@@ -107,7 +107,7 @@ You should end up with this:
- TAG_Short("shortTest"): 32767
- TAG_Long("longTest"): 9223372036854775807
- TAG_Float("floatTest"): 0.49823147
-- TAG_String("stringTest"): HELLO WORLD THIS IS A TEST STRING ���!
-+ TAG_String("stringTest"): HELLO WORLD THIS IS A TEST STRING ÅÄÖ!
- TAG_Int("intTest"): 2147483647
- TAG_Compound("nested compound test"): 2 entries
- {
diff --git a/debian/patches/001-remove-coverall.patch b/debian/patches/001-remove-coverall.patch
index 2afabb8..a1c1b99 100644
--- a/debian/patches/001-remove-coverall.patch
+++ b/debian/patches/001-remove-coverall.patch
@@ -7,10 +7,10 @@ Remove rubygems and coveralls
test/test_helper.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index 0bce6f4..e23cea7 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
+Index: ruby-bindata.git/test/test_helper.rb
+===================================================================
+--- ruby-bindata.git.orig/test/test_helper.rb
++++ ruby-bindata.git/test/test_helper.rb
@@ -1,7 +1,7 @@
-require 'rubygems'
+#require 'rubygems'
diff --git a/debian/patches/series b/debian/patches/series
index 1daa3cc..c3ab5e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
001-remove-coverall.patch
-0002-Convert-examples-NBT.txt-to-UTF-8.patch
diff --git a/examples/NBT.txt b/examples/NBT.txt
index 7ed61ca..9b5bac2 100644
--- a/examples/NBT.txt
+++ b/examples/NBT.txt
@@ -107,7 +107,7 @@ You should end up with this:
TAG_Short("shortTest"): 32767
TAG_Long("longTest"): 9223372036854775807
TAG_Float("floatTest"): 0.49823147
- TAG_String("stringTest"): HELLO WORLD THIS IS A TEST STRING ���!
+ TAG_String("stringTest"): HELLO WORLD THIS IS A TEST STRING ÅÄÖ!
TAG_Int("intTest"): 2147483647
TAG_Compound("nested compound test"): 2 entries
{
diff --git a/lib/bindata/delayed_io.rb b/lib/bindata/delayed_io.rb
index e1926da..451bb06 100644
--- a/lib/bindata/delayed_io.rb
+++ b/lib/bindata/delayed_io.rb
@@ -159,9 +159,10 @@ module BinData
# The +auto_call_delayed_io+ keyword sets a data object tree to perform
# multi pass I/O automatically.
def auto_call_delayed_io
+ include AutoCallDelayedIO
+
return if DelayedIO.method_defined? :initialize_instance_without_record_io
- include AutoCallDelayedIO
DelayedIO.send(:alias_method, :initialize_instance_without_record_io, :initialize_instance)
DelayedIO.send(:define_method, :initialize_instance) do
if @parent && !defined? @delayed_io_recorded
diff --git a/lib/bindata/version.rb b/lib/bindata/version.rb
index 34cef4e..a127d6c 100644
--- a/lib/bindata/version.rb
+++ b/lib/bindata/version.rb
@@ -1,3 +1,3 @@
module BinData
- VERSION = "2.4.14"
+ VERSION = "2.4.15"
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/specifications/bindata-2.4.15.gemspec
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/alignment.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/array.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/base.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/base_primitive.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/bits.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/buffer.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/choice.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/count_bytes_remaining.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/delayed_io.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/dsl.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/float.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/framework.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/int.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/io.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/lazy.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/name.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/offset.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/params.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/primitive.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/record.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/registry.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/rest.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/sanitize.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/skip.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/string.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/stringz.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/struct.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/trace.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/uint8_array.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/version.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/virtual.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/gems/bindata-2.4.14/lib/bindata/warnings.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/specifications/bindata-2.4.14.gemspec
No differences were encountered in the control files