[DRE-commits] [ruby-tilt] 03/07: refresh/drop patches

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-tilt.

commit 67fbe89af5a1d8ea405af2beb025f28e58e7bd0a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Dec 23 19:08:22 2015 +0530

    refresh/drop patches
---
 debian/changelog                                 |  1 +
 debian/patches/force_encoding_erb_test           | 11 +++++++----
 debian/patches/new-test-unit-compatibility.patch | 24 ------------------------
 debian/patches/series                            |  1 -
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ccea53..51c2d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ruby-tilt (2.0.1-1) UNRELEASED; urgency=medium
 
   [ Pirate Praveen ]
   * New upstream release (stage in experimental to sort reverse dependencies)
+  * Drop patch: new-test-unit-compatibility.patch (not needed for this version)
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 23 Dec 2015 19:01:09 +0530
 
diff --git a/debian/patches/force_encoding_erb_test b/debian/patches/force_encoding_erb_test
index 93f7b50..c831ae7 100644
--- a/debian/patches/force_encoding_erb_test
+++ b/debian/patches/force_encoding_erb_test
@@ -9,12 +9,15 @@ Bug-Debian: http://bugs.debian.org/628271
 Forwarded: https://github.com/rtomayko/tilt/pull/97
 Last-Update: 2013-07-22
 
---- ruby-tilt-1.4.1.orig/test/tilt_template_test.rb
-+++ ruby-tilt-1.4.1/test/tilt_template_test.rb
-@@ -1,3 +1,6 @@
+Index: ruby-tilt/test/tilt_template_test.rb
+===================================================================
+--- ruby-tilt.orig/test/tilt_template_test.rb
++++ ruby-tilt/test/tilt_template_test.rb
+@@ -1,4 +1,7 @@
  # coding: utf-8
 +if RUBY_VERSION >= '1.9.1'
 +    Encoding.default_external = "UTF-8"
 +end
- require 'contest'
+ require 'test_helper'
  require 'tilt'
+ require 'tilt/template'
diff --git a/debian/patches/new-test-unit-compatibility.patch b/debian/patches/new-test-unit-compatibility.patch
deleted file mode 100644
index 9fc15f8..0000000
--- a/debian/patches/new-test-unit-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: compatibility with latest test-unit
- This patch will not be needed after this upstream version since upstream have
- moved to minitest.
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: not-needed
-
---- ruby-tilt-2.0.0+really1.4.1.orig/test/contest.rb
-+++ ruby-tilt-2.0.0+really1.4.1/test/contest.rb
-@@ -46,6 +46,14 @@ class Test::Unit::TestCase
-     alias_method :describe, :context
-   end
- 
-+  def assert_not_match(v1, v2, *anything_else)
-+    if v1.is_a?(String)
-+      super(Regexp.new(Regexp.escape(v1)), v2, *anything_else)
-+    else
-+      super
-+    end
-+  end
-+
- private
- 
-   def self.context_name(name)
diff --git a/debian/patches/series b/debian/patches/series
index 0446da4..711e9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 force_encoding_erb_test
-new-test-unit-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-tilt.git