[DRE-commits] [ruby-albino] 03/06: install multipygmentize script, used by albino/multi.rb (fix autopkgtests)

[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-albino.

commit 48a9bded1457dec054994633d9ae846456d2124e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jun 3 16:24:20 2016 +0200

    install multipygmentize script, used by albino/multi.rb (fix autopkgtests)
---
 debian/patches/003_move_multipygmentize.patch | 22 ++++++++++++++++++++++
 debian/patches/series                         |  1 +
 debian/ruby-albino.install                    |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/patches/003_move_multipygmentize.patch b/debian/patches/003_move_multipygmentize.patch
new file mode 100644
index 0000000..48ff1a8
--- /dev/null
+++ b/debian/patches/003_move_multipygmentize.patch
@@ -0,0 +1,22 @@
+Description: use installed version of multipygmentize if possible
+ fixes usage of abino/multi.rb (and thus autopkgtests)
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2016-06-03
+
+--- a/lib/albino/multi.rb
++++ b/lib/albino/multi.rb
+@@ -30,7 +30,11 @@
+     end
+ 
+     self.timeout_threshold = 10
+-    self.bin = File.join(File.dirname(__FILE__), *%w(.. .. vendor multipygmentize))
++    if File.exist?("/usr/lib/ruby-albino/multipygmentize")
++      self.bin = "/usr/lib/ruby-albino/multipygmentize"
++    else
++      self.bin = File.join(File.dirname(__FILE__), *%w(.. .. vendor multipygmentize))
++    end
+ 
+     # Initializes a new Albino::Multi and runs #colorize.
+     def self.colorize(*args)
diff --git a/debian/patches/series b/debian/patches/series
index b649ad7..4b107fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 001_fix_Albino_Multi_accepting_UTF-8_input.patch
 002_fix-albino-according-pygments.patch
+003_move_multipygmentize.patch
diff --git a/debian/ruby-albino.install b/debian/ruby-albino.install
new file mode 100644
index 0000000..8e04473
--- /dev/null
+++ b/debian/ruby-albino.install
@@ -0,0 +1 @@
+vendor/multipygmentize /usr/lib/ruby-albino

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