[DRE-commits] [jekyll] 05/06: Add patches: Remove newline for Maruku(=> 0.7.1), coffee-script, Fix relative LOAD_PATH, Update test for newer RDiscount

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository jekyll.

commit cd260de20e4407bfa0b213d1c06789898ac0389a
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Jun 10 17:26:32 2014 +0900

    Add patches: Remove newline for Maruku(=> 0.7.1), coffee-script, Fix relative LOAD_PATH, Update test for newer RDiscount
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../0005-Remove-newline-for-newer-Maruku.patch      | 20 ++++++++++++++++++++
 ...06-Fix-relative-LOAD_PATH-in-test_redcloth.patch | 17 +++++++++++++++++
 .../0007-Add-newline-in-test_coffee_script.patch    | 19 +++++++++++++++++++
 .../0008-Update-test-for-newer-RDiscount.patch      | 21 +++++++++++++++++++++
 debian/patches/series                               |  4 ++++
 5 files changed, 81 insertions(+)

diff --git a/debian/patches/0005-Remove-newline-for-newer-Maruku.patch b/debian/patches/0005-Remove-newline-for-newer-Maruku.patch
new file mode 100644
index 0000000..676ba98
--- /dev/null
+++ b/debian/patches/0005-Remove-newline-for-newer-Maruku.patch
@@ -0,0 +1,20 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 10 Jun 2014 16:32:44 +0900
+Subject: Remove newline for newer Maruku
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_tags.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test/test_tags.rb
++++ b/test/test_tags.rb
+@@ -525,7 +525,7 @@ CONTENT
+ 
+       # todo: if #112 is merged into maruku, update to remove the newlines inside code block
+       should "render fenced code blocks" do
+-        assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">\nputs "Hello world"\n</code></pre>}, @result.strip
++        assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">puts "Hello world"</code></pre>}, @result.strip
+       end
+     end
+ 
diff --git a/debian/patches/0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch b/debian/patches/0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
new file mode 100644
index 0000000..579c805
--- /dev/null
+++ b/debian/patches/0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
@@ -0,0 +1,17 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 10 Jun 2014 17:31:51 +0900
+Subject: Fix relative LOAD_PATH in test_redcloth
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_redcloth.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test/test_redcloth.rb
++++ b/test/test_redcloth.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/helper'
++require 'helper'
+ 
+ class TestRedCloth < Test::Unit::TestCase
+ 
diff --git a/debian/patches/0007-Add-newline-in-test_coffee_script.patch b/debian/patches/0007-Add-newline-in-test_coffee_script.patch
new file mode 100644
index 0000000..ac909e9
--- /dev/null
+++ b/debian/patches/0007-Add-newline-in-test_coffee_script.patch
@@ -0,0 +1,19 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 10 Jun 2014 17:58:52 +0900
+Subject: Add newline in test_coffee_script
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_coffeescript.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/test/test_coffeescript.rb
++++ b/test/test_coffeescript.rb
+@@ -11,6 +11,7 @@ class TestCoffeeScript < Test::Unit::TestCase
+       @test_coffeescript_file = dest_dir("js/coffeescript.js")
+       @js_output = <<-JS
+ (function() {
++
+   $(function() {
+     var cube, cubes, list, num, square;
+     list = [1, 2, 3, 4, 5];
diff --git a/debian/patches/0008-Update-test-for-newer-RDiscount.patch b/debian/patches/0008-Update-test-for-newer-RDiscount.patch
new file mode 100644
index 0000000..d6f182a
--- /dev/null
+++ b/debian/patches/0008-Update-test-for-newer-RDiscount.patch
@@ -0,0 +1,21 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Tue, 10 Jun 2014 18:34:50 +0900
+Subject: Update test for newer RDiscount
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_rdiscount.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- jekyll.orig/test/test_rdiscount.rb
++++ jekyll/test/test_rdiscount.rb
+@@ -16,7 +16,7 @@
+     end
+ 
+     should "render toc" do
+-      assert_equal "<h1 id=\"Header+1\">Header 1</h1>\n\n<h2 id=\"Header+2\">Header 2</h2>\n\n<p>\n <ul>\n <li><a href=\"#Header+1\">Header 1</a>\n  <ul>\n  <li><a href=\"#Header+2\">Header 2</a>  </li>\n  </ul>\n </li>\n </ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
++      assert_equal "<a name=\"Header.1\"></a>\n<h1>Header 1</h1>\n\n<a name=\"Header.2\"></a>\n<h2>Header 2</h2>\n\n<p><ul>\n <li><a href=\"#Header.1\">Header 1</a>\n <ul>\n  <li><a href=\"#Header.2\">Header 2</a></li>\n </ul>\n </li>\n</ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
+     end
+   end
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 41fb08e..f3c2b5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,7 @@
 0002-Drop-RubyGems-Depends.patch
 0003-Downcase-RedCloth.patch
 0004-Remove-Launchy-Dependencies.patch
+0005-Remove-newline-for-newer-Maruku.patch
+0006-Fix-relative-LOAD_PATH-in-test_redcloth.patch
+0007-Add-newline-in-test_coffee_script.patch
+0008-Update-test-for-newer-RDiscount.patch

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