[DRE-commits] [ruby-haml] 04/06: add fix_tests_form_opener_rails4.patch privacy_breach.patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-haml.

commit 4e3345bf4088402c94d1c4773efcd6dee6503269
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Sep 12 23:17:15 2014 +0200

    add fix_tests_form_opener_rails4.patch privacy_breach.patch
---
 debian/patches/fix_tests_form_opener_rails4.patch | 23 +++++++++++++++++++++++
 debian/patches/privacy_breach.patch               | 17 +++++++++++++++++
 debian/patches/series                             |  2 ++
 3 files changed, 42 insertions(+)

diff --git a/debian/patches/fix_tests_form_opener_rails4.patch b/debian/patches/fix_tests_form_opener_rails4.patch
new file mode 100644
index 0000000..aa477a5
--- /dev/null
+++ b/debian/patches/fix_tests_form_opener_rails4.patch
@@ -0,0 +1,23 @@
+Description: adapt rails_form_opener for rails 4.1 and 4.2
+Origin: upstream,https://github.com/haml/haml/commit/9967454b6eb9bc6889c3d9c643b92d11f33f819b.patch
+Origin: upstream,https://github.com/haml/haml/commit/a16c154fcb2903cbb208a3ec9784117621cd2088.patch
+Reviewed-by: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-09-12
+
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -64,7 +64,13 @@
+   end
+ 
+   def rails_form_opener
+-    '<div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>'
++    if Rails.version < '4.1.0'
++      '<div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>'
++    elsif Rails.version < '4.2.0'
++      '<div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div>'
++    else
++      '<input name="utf8" type="hidden" value="&#x2713;" />'
++    end
+   end
+ 
+   def assert_raises_message(klass, message)
diff --git a/debian/patches/privacy_breach.patch b/debian/patches/privacy_breach.patch
new file mode 100644
index 0000000..35851a9
--- /dev/null
+++ b/debian/patches/privacy_breach.patch
@@ -0,0 +1,17 @@
+Description: remove link to a remote image in the README
+ Is is considered as a privacy breach, as the image is automatically loaded
+ from the remote site from the HTML generated documentation.
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2014-09-12
+
+--- a/README.md
++++ b/README.md
+@@ -1,7 +1,5 @@
+ # Haml
+ 
+-[![Build Status](https://secure.travis-ci.org/haml/haml.png?branch=master)](http://travis-ci.org/haml/haml)
+-
+ Haml is a templating engine for HTML. It's designed to make it both easier and
+ more pleasant to write HTML documents, by eliminating redundancy, reflecting the
+ underlying structure that the document represents, and providing an elegant syntax
diff --git a/debian/patches/series b/debian/patches/series
index 68f71cb..3a37b61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 avoid_rake_early_death
 no_rubygems_in_tests
+fix_tests_form_opener_rails4.patch
+privacy_breach.patch

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