[DRE-commits] [SCM] ruby-haml-magic-translations.git branch, master, updated. debian/0.5.1-2-6-gcc8852b

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 23beee3eeb5f5adbf352d296a2227ff710b9438f
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Jun 16 19:50:03 2013 +0200

    Add a patch to use the markdown filter in the test suite until haml-contrib is packaged

diff --git a/debian/patches/0001-Switch-specs-to-use-the-generic-markdown-filter-inst.patch b/debian/patches/0001-Switch-specs-to-use-the-generic-markdown-filter-inst.patch
new file mode 100644
index 0000000..77808e1
--- /dev/null
+++ b/debian/patches/0001-Switch-specs-to-use-the-generic-markdown-filter-inst.patch
@@ -0,0 +1,22 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+Date: Sun, 16 Jun 2013 19:48:33 +0200
+Subject: Switch specs to use the generic markdown filter instead of maruku
+
+This patch should be kept until #710166 gets closed.
+---
+ spec/haml/magic_translations_spec.rb |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/haml/magic_translations_spec.rb b/spec/haml/magic_translations_spec.rb
+index 936648c..a23a2a2 100644
+--- a/spec/haml/magic_translations_spec.rb
++++ b/spec/haml/magic_translations_spec.rb
+@@ -186,7 +186,7 @@ module Haml
+       context 'when translating strings in Markdown' do
+         it "should translate strings inside _('')" do
+           render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+-            :maruku
++            :markdown
+               Now we will check multiline strings,
+               which should be also translated.
+           HAML
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..acdb880
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Switch-specs-to-use-the-generic-markdown-filter-inst.patch

-- 
ruby-haml-magic-translations.git