[DRE-commits] [ruby-babosa] 01/01: Solve interference with ruby-unicode-display-width

[Michael Moll]

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

mmoll-guest pushed a commit to branch master
in repository ruby-babosa.

commit ca258477654b7931b2e9fd313cd6980ad04f3ec3
Author: Michael Moll <Michael Moll kvedulv at kvedulv.de>
Date:   Fri Nov 18 14:23:59 2016 +0100

    Solve interference with ruby-unicode-display-width
    
    patch taken from https://github.com/norman/babosa/pull/42
---
 debian/changelog                           |  6 ++++++
 debian/patches/series                      |  1 +
 debian/patches/unicode_version_check.patch | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 290d1ba..8fca510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-babosa (1.0.2-2) unstable; urgency=medium
+
+  * Solve interference with ruby-unicode-display-width
+
+ -- Michael Moll <kvedulv at kvedulv.de>  Fri, 18 Nov 2016 14:22:08 +0100
+
 ruby-babosa (1.0.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #807465)
diff --git a/debian/patches/series b/debian/patches/series
index 0712931..e59be69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove-bundler.patch
+unicode_version_check.patch
diff --git a/debian/patches/unicode_version_check.patch b/debian/patches/unicode_version_check.patch
new file mode 100644
index 0000000..7b49a25
--- /dev/null
+++ b/debian/patches/unicode_version_check.patch
@@ -0,0 +1,22 @@
+From 493bd545ef6d73ecd2b211ba178b4b22e592f457 Mon Sep 17 00:00:00 2001
+From: Jan Lelis <mail at janlelis.de>
+Date: Sat, 27 Feb 2016 16:45:16 +0100
+Subject: [PATCH] More detailed check if unicode gem is available
+
+---
+ lib/babosa/identifier.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/babosa/identifier.rb b/lib/babosa/identifier.rb
+index 2cfdd11..8101aa3 100644
+--- a/lib/babosa/identifier.rb
++++ b/lib/babosa/identifier.rb
+@@ -37,7 +37,7 @@ class Identifier
+ 
+     @@utf8_proxy = if Babosa.jruby15?
+       UTF8::JavaProxy
+-    elsif defined? Unicode
++    elsif defined? Unicode::VERSION
+       UTF8::UnicodeProxy
+     elsif defined? ActiveSupport
+       UTF8::ActiveSupportProxy

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