[DRE-commits] [SCM] ruby-wikicloth.git branch, master, updated. debian/0.8.0_git.20130605.851eb9a-1-3-gc01b7cc

[Per Andersson]

The following commit has been merged in the master branch:
commit 5968641fc21a52ca1ebf6217e9a90e1ccdc09079
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat Jun 8 20:48:38 2013 +0200

    Use i18n gem instead of broken wikicloth/i18n

diff --git a/debian/changelog b/debian/changelog
index a13cf95..f368c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-wikicloth (0.8.0~git.20130605.851eb9a-2) UNRELEASED; urgency=low
+
+  * Use i18n gem instead of broken wikicloth/i18n
+
+ -- Per Andersson <avtobiff at gmail.com>  Sat, 08 Jun 2013 20:45:40 +0200
+
 ruby-wikicloth (0.8.0~git.20130605.851eb9a-1) unstable; urgency=low
 
   * Initial release (Closes: #703279)
diff --git a/debian/control b/debian/control
index 9d03a97..b75a602 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends:
  ruby | ruby-interpreter,
  ruby-builder,
  ruby-expression-parser,
+ ruby-i18n,
  ruby-rinku
 Suggests:
  ruby-wikicloth-doc
diff --git a/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch b/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
new file mode 100644
index 0000000..c1dd876
--- /dev/null
+++ b/debian/patches/0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
@@ -0,0 +1,24 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Sat, 8 Jun 2013 20:34:19 +0200
+Subject: Use i18n gem instead of wikicloth/i18n
+
+Seems like wikicloth/i18n is broken.
+
+See http://github.com/nricciar/wikicloth/issues/61
+---
+ lib/wikicloth.rb |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/wikicloth.rb b/lib/wikicloth.rb
+index bd1af7c..fb62352 100644
+--- a/lib/wikicloth.rb
++++ b/lib/wikicloth.rb
+@@ -1,6 +1,8 @@
+ #require 'rubygems' if RUBY_VERSION < '1.9'
+ require 'jcode' if RUBY_VERSION < '1.9'
+ require 'builder'
++# debian: use i18n, wikicloth/i18n seems broken
++require 'i18n'
+ # if i18n gem loaded use it instead
+ require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "i18n") unless defined?(I18n)
+ I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks) if defined?(I18n::Backend::Simple)
diff --git a/debian/patches/series b/debian/patches/series
index afca06a..6ec0c4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Remove-gemspec-git-ls-files.patch
 0003-Ignore-code-coverage-test.patch
 0004-Remove-gem-explicit-versioning.patch
+0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch

-- 
ruby-wikicloth.git