[DRE-commits] [ruby-redcarpet] 07/08: Rm patch 0002-Fix-markdown_test.patch; add patch fix_test_no_rewind_into_previous_inline.patch

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository ruby-redcarpet.

commit 6156e3d97a067bd5c4e04f4af2d7723420bf4632
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Wed May 6 11:46:33 2015 +0200

    Rm patch 0002-Fix-markdown_test.patch; add patch fix_test_no_rewind_into_previous_inline.patch
---
 debian/patches/0002-Fix-markdown_test.patch        | 22 -------------------
 .../fix_test_no_rewind_into_previous_inline.patch  | 25 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/debian/patches/0002-Fix-markdown_test.patch b/debian/patches/0002-Fix-markdown_test.patch
deleted file mode 100644
index da63a8d..0000000
--- a/debian/patches/0002-Fix-markdown_test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Thu, 27 Feb 2014 21:22:41 +0900
-Subject: Fix markdown_test
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- test/markdown_test.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ruby-redcarpet/test/markdown_test.rb
-===================================================================
---- ruby-redcarpet.orig/test/markdown_test.rb
-+++ ruby-redcarpet/test/markdown_test.rb
-@@ -306,6 +306,7 @@ text
- 
-   def test_references_with_tabs_after_colon
-     markdown = @markdown.render("[Link][id]\n[id]:\t\t\thttp://google.es")
--    html_equal "<p><a href=\"http://google.es\">Link</a></p>\n", markdown
-+    html_equal '<p><a href="http://google.es">Link</a></p>
-+', markdown
-   end
- end
diff --git a/debian/patches/fix_test_no_rewind_into_previous_inline.patch b/debian/patches/fix_test_no_rewind_into_previous_inline.patch
new file mode 100644
index 0000000..ad7bab0
--- /dev/null
+++ b/debian/patches/fix_test_no_rewind_into_previous_inline.patch
@@ -0,0 +1,25 @@
+Description: Fix test (Ruby2.2-specific syntax?)
+Author: Lucas Nussbaum <lucas at debian.org>
+Origin: vendor
+Bug: https://github.com/vmg/redcarpet/issues/485
+Forwarded: https://github.com/vmg/redcarpet/issues/485
+Last-Update: 2015-05-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/markdown_test.rb
++++ b/test/markdown_test.rb
+@@ -311,12 +311,12 @@ text
+ 
+   def test_no_rewind_into_previous_inline
+     result = "<p><em>!dl</em><a href=\"mailto:1 at danlec.com\">1 at danlec.com</a></p>\n"
+-    output = render("_!dl_1 at danlec.com", with: [:autolink])
++    output = render_with({:autolink => true}, "_!dl_1 at danlec.com")
+ 
+     assert_equal result, output
+ 
+     result = "<p>abc123<em><a href=\"http://www.foo.com\">www.foo.com</a></em>@foo.com</p>\n"
+-    output = render("abc123_www.foo.com_ at foo.com", with: [:autolink])
++    output = render_with({:autolink => true}, "abc123_www.foo.com_ at foo.com")
+ 
+     assert_equal result, output
+   end
diff --git a/debian/patches/series b/debian/patches/series
index 6a1d024..0146a05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Remove-RubyGems-Depends.patch
-0002-Fix-markdown_test.patch
+fix_test_no_rewind_into_previous_inline.patch

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