[DRE-commits] [asciidoctor] 02/04: Patch bin/asciidoctor to require asciidoctor

[Guillaume Grossetie]

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

ggrossetie-guest pushed a commit to branch master
in repository asciidoctor.

commit 81cccd5f6a45875ee549e2386e20a1da80174b63
Author: Guillaume Grossetie <ggrossetie at gmail.com>
Date:   Tue Jun 9 12:17:05 2015 +0200

    Patch bin/asciidoctor to require asciidoctor
---
 debian/patches/require-asciidoctor.patch | 17 +++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 18 insertions(+)

diff --git a/debian/patches/require-asciidoctor.patch b/debian/patches/require-asciidoctor.patch
new file mode 100644
index 0000000..743b631
--- /dev/null
+++ b/debian/patches/require-asciidoctor.patch
@@ -0,0 +1,17 @@
+Index: asciidoctor/bin/asciidoctor
+===================================================================
+--- asciidoctor.orig/bin/asciidoctor	2015-06-15 22:07:39.149451578 +0200
++++ asciidoctor/bin/asciidoctor	2015-06-15 22:17:06.909460761 +0200
+@@ -2,7 +2,11 @@
+ 
+ require 'rubygems' if RUBY_VERSION < '1.9'
+ 
+-require File.join File.dirname(__FILE__), '../lib/asciidoctor'
++if File.exist?(asciidoctor_lib_path = File.join(File.dirname(__FILE__), '../lib/asciidoctor'))
++  require asciidoctor_lib_path
++else
++  require 'asciidoctor'
++end
+ require 'asciidoctor/cli'
+ 
+ invoker = Asciidoctor::Cli::Invoker.new ARGV
diff --git a/debian/patches/series b/debian/patches/series
index d4b3bf7..b6530c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 update-asciidoctor.1-manpage.patch
+require-asciidoctor.patch

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