[DRE-commits] [SCM] ruby-test-unit.git branch, master, updated. debian/2.4.0-1-4-gfde6402

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2d21dd40eb46572ae1ee48034814f50d466191f3
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Nov 10 00:08:03 2011 +0100

    drop 0010-fix_test_assert_equal_with_different_encoding.patch; prepare upload

diff --git a/debian/changelog b/debian/changelog
index 7d06d3e..6be1fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-test-unit (2.4.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Drop 0010-fix_test_assert_equal_with_different_encoding.patch applied
+    upstream
+
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Wed, 09 Nov 2011 23:47:37 +0100
+
 ruby-test-unit (2.4.0-1) unstable; urgency=low
 
   * Initial release (Closes: #626792)
diff --git a/debian/patches/0010-fix_test_assert_equal_with_different_encoding.patch b/debian/patches/0010-fix_test_assert_equal_with_different_encoding.patch
deleted file mode 100644
index f1926f4..0000000
--- a/debian/patches/0010-fix_test_assert_equal_with_different_encoding.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: test_assert_equal_with_different_encoding failing with LANG=C
- Setting the default external encoding to UTF-8 fixes the issue.
-Origin: https://github.com/test-unit/test-unit/commit/364b2e9775e0c4177ad23c5700fb78dbf174bf56
-Last-Update: 2011-09-25
-Bug: https://github.com/test-unit/test-unit/issues/11
-Applied-Upstream:
-
---- a/test/test-assertions.rb
-+++ b/test/test-assertions.rb
-@@ -330,7 +330,7 @@
-         end
-         ascii_8bit_string = utf8_string.dup.force_encoding("ascii-8bit")
-         message = <<-EOM.chomp
--<"こんにちは">("UTF-8") expected but was
-+<#{utf8_string.inspect}>("UTF-8") expected but was
- <#{ascii_8bit_string.inspect}>("ASCII-8BIT").
- EOM
-         check_fails(message) do
diff --git a/debian/patches/series b/debian/patches/series
index 8ac509c..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0010-fix_test_assert_equal_with_different_encoding.patch

-- 
ruby-test-unit.git