[DRE-commits] [SCM] ruby-ogginfo.git branch, master, updated. debian/0.6.5-2-3-ge693c2e
Gunnar Wolf
gwolf at gwolf.org
Mon Jan 23 18:32:03 UTC 2012
The following commit has been merged in the master branch:
commit e693c2ef7593c800cfc47c9a271d83b448b8e47b
Author: Gunnar Wolf <gwolf at gwolf.org>
Date: Mon Jan 23 12:30:50 2012 -0600
New upstream release
* New upstream release
* Removed debian/patches/class_eval_requires_strings_under_1.9.1 and
debian/patches/encoding_fixes_for_1.9.1 as they were incorporated
upstream
* Include the upstream changelog as well
diff --git a/debian/changelog b/debian/changelog
index 4cbe591..a41cbf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-ogginfo (0.6.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed debian/patches/class_eval_requires_strings_under_1.9.1 and
+ debian/patches/encoding_fixes_for_1.9.1 as they were incorporated
+ upstream
+ * Include the upstream changelog as well
+
+ -- Gunnar Wolf <gwolf at debian.org> Mon, 23 Jan 2012 12:30:21 -0600
+
ruby-ogginfo (0.6.5-2) unstable; urgency=low
* Added missing build-dependency on vorbis-tools, used in the test
diff --git a/debian/patches/class_eval_requires_strings_under_1.9.1 b/debian/patches/class_eval_requires_strings_under_1.9.1
deleted file mode 100644
index 337575c..0000000
--- a/debian/patches/class_eval_requires_strings_under_1.9.1
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Gunnar Wolf <gwolf at debian.org>
-Last-Update: 2011-08-11
-Forwarded: https://github.com/gwolf/ruby-ogginfo/commit/558f420f1d2b5870d74241354669c0ca3d57b7b9 (pull request on github)
-Description: When running under Ruby 1.9.1, all tests fail (and quite
- probably any module usage as well) because class_eval no longer
- accepts symbols (strings are required).
-
-Index: ruby-ogginfo/lib/ogg.rb
-===================================================================
---- ruby-ogginfo.orig/lib/ogg.rb 2011-08-11 16:27:52.000000000 -0500
-+++ ruby-ogginfo/lib/ogg.rb 2011-08-11 16:27:54.000000000 -0500
-@@ -86,7 +86,7 @@
- input.rewind
- end
-
-- codecs = Ogg::Codecs.constants.map { |module_name| Ogg::Codecs.class_eval(module_name) }.select { |c| c.is_a?(Class) }
-+ codecs = Ogg::Codecs.constants.map { |module_name| Ogg::Codecs.class_eval(module_name.to_s) }.select { |c| c.is_a?(Class) }
- codec = codecs.detect { |c| c.match?(first_page.segments.first) }
- unless codec
- raise(StreamError,"unknown codec")
diff --git a/debian/patches/encoding_fixes_for_1.9.1 b/debian/patches/encoding_fixes_for_1.9.1
deleted file mode 100644
index 4ecdfbf..0000000
--- a/debian/patches/encoding_fixes_for_1.9.1
+++ /dev/null
@@ -1,70 +0,0 @@
-Author: Gunnar Wolf <gwolf at debian.org>
-Last-Update: 2011-08-11
-Forwarded: https://github.com/gwolf/ruby-ogginfo/commit/558f420f1d2b5870d74241354669c0ca3d57b7b9 (pull request on github)
-Description: Fix an encoding issue breaking all tests under Ruby 1.9.1
- Strings in Ruby 1.9.1 are no longer defined as an array of bytes, but
- as an array of (encoding-aware) characters. This forces a string to
- be built as a series of bytes, and allows the tests to pass.
-
-Index: ruby-ogginfo-0.6.5/test/test_ruby-ogginfo.rb
-===================================================================
---- ruby-ogginfo-0.6.5.orig/test/test_ruby-ogginfo.rb 2011-08-11 18:18:55.000000000 -0500
-+++ ruby-ogginfo-0.6.5/test/test_ruby-ogginfo.rb 2011-08-11 18:23:28.000000000 -0500
-@@ -146,7 +146,14 @@
- end
-
- OggInfo.open(tf.path, "iso-8859-1") do |ogg|
-- assert_equal "hello\xe9", ogg.tag["title"]
-+ if RUBY_VERSION[0..2] == '1.8'
-+ assert_equal "hello\xe9", ogg.tag["title"]
-+ else
-+ string = ''
-+ string.force_encoding 'iso-8859-1'
-+ [104, 101, 108, 108, 111, 233].each {|chr| string << chr}
-+ assert_equal string, ogg.tag["title"]
-+ end
- end
- end
-
-Index: ruby-ogginfo-0.6.5/test/test_ruby-spxinfo.rb
-===================================================================
---- ruby-ogginfo-0.6.5.orig/test/test_ruby-spxinfo.rb 2011-08-11 18:18:55.000000000 -0500
-+++ ruby-ogginfo-0.6.5/test/test_ruby-spxinfo.rb 2011-08-11 18:19:10.000000000 -0500
-@@ -91,12 +91,33 @@
- def test_charset
- generate_spx
- FileUtils.cp("test.spx",GEN_FILE)
-- OggInfo.open(GEN_FILE, "utf-8") do |spx|
-+ if RUBY_VERSION[0..2] == '1.8'
-+ OggInfo.open(GEN_FILE, "utf-8") do |spx|
- assert_equal "hello\303\251",spx.tag["test"]
-- end
-+ end
-+
-+ OggInfo.open(GEN_FILE, "iso-8859-1") do |spx|
-+ assert_equal "hello\xe9", spx.tag["test"]
-+ end
-+
-+ else
-+ # In Ruby >= 1.9, all strings are UTF-8, and are made up by
-+ # characters (and not anymore bytes). So, we hand-craft it in a
-+ # dumb-enough encoding.
-+ OggInfo.open(GEN_FILE, "utf-8") do |spx|
-+ string = ''
-+ string.force_encoding 'ascii-8bit'
-+ [104, 101, 108, 108, 111, 195, 169].each {|chr| string << chr}
-+ assert_equal string, spx.tag["test"]
-+ end
-+
-+ OggInfo.open(GEN_FILE, "iso-8859-1") do |spx|
-+ string = ''
-+ string.force_encoding 'iso-8859-1'
-+ [104, 101, 108, 108, 111, 233].each {|chr| string << chr}
-+ assert_equal string, spx.tag["test"]
-+ end
-
-- OggInfo.open(GEN_FILE, "iso-8859-1") do |spx|
-- assert_equal "hello\xe9", spx.tag["test"]
- end
- end
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7f4b65c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-encoding_fixes_for_1.9.1
-class_eval_requires_strings_under_1.9.1
diff --git a/debian/ruby-ogginfo.docs b/debian/ruby-ogginfo.docs
index e475c53..71dfd5b 100644
--- a/debian/ruby-ogginfo.docs
+++ b/debian/ruby-ogginfo.docs
@@ -1 +1 @@
-README.rdoc
+README.txt
diff --git a/debian/rules b/debian/rules
index a5e7dc8..61a3595 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,6 @@
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_installchangelogs:
+ dh_installchangelogs History.txt
--
ruby-ogginfo.git
More information about the Pkg-ruby-extras-commits
mailing list