[DRE-commits] [asciidoctor] 03/03: Copy data/ files into /usr/share/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 b4a4a700f1fb77544e3a890a6a6fd21d6cfc6cec
Author: Guillaume Grossetie <ggrossetie at gmail.com>
Date:   Tue Jun 16 19:46:04 2015 +0200

    Copy data/ files into /usr/share/asciidoctor
---
 debian/asciidoctor.install     |  2 +-
 debian/patches/data_path.patch | 16 ++++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/asciidoctor.install b/debian/asciidoctor.install
index f16d4f4..c1d5393 100644
--- a/debian/asciidoctor.install
+++ b/debian/asciidoctor.install
@@ -1 +1 @@
-data/* usr/lib/ruby/data/
+data/* usr/share/asciidoctor
diff --git a/debian/patches/data_path.patch b/debian/patches/data_path.patch
new file mode 100644
index 0000000..e48ccb8
--- /dev/null
+++ b/debian/patches/data_path.patch
@@ -0,0 +1,16 @@
+From: Guillaume Grossetie <ggrossetie at gmail.com>
+Subject: Load data from /usr/share/asciidoctor path
+Bug-Debian: https://bugs.debian.org/788052
+Index: asciidoctor/lib/asciidoctor.rb
+===================================================================
+--- asciidoctor.orig/lib/asciidoctor.rb	2015-06-17 20:32:38.975724893 +0200
++++ asciidoctor/lib/asciidoctor.rb	2015-06-17 20:32:54.199725139 +0200
+@@ -179,7 +179,7 @@
+   LIB_PATH = ::File.join ROOT_PATH, 'lib'
+ 
+   # The absolute data path of the Asciidoctor RubyGem
+-  DATA_PATH = ::File.join ROOT_PATH, 'data'
++  DATA_PATH = ::File.exist?(asciidoctor_lib_path = ::File.join(ROOT_PATH, 'data')) ? asciidoctor_lib_path : ::File.join(ROOT_PATH, '../../share/asciidoctor')
+ 
+   # The user's home directory, as best we can determine it
+   # NOTE not using infix rescue for performance reasons, see: https://github.com/jruby/jruby/issues/1816
diff --git a/debian/patches/series b/debian/patches/series
index b6530c2..a4a45bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 update-asciidoctor.1-manpage.patch
 require-asciidoctor.patch
+data_path.patch
diff --git a/debian/rules b/debian/rules
index d3415b1..5d9df51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ override_dh_auto_build:
 	rdoc --main=README.adoc lib
 
 override_dh_auto_install:
+	dh_install
 	dh_auto_install
 	# remove asciidoctor-safe
 	rm -f debian/asciidoctor/usr/bin/asciidoctor-safe

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