[DRE-commits] [asciidoctor] 03/05: Remove slim patch

[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 3e1507bc2c1e8d47f3fb088638ace1af7ec8ee87
Author: Guillaume Grossetie <ggrossetie at gmail.com>
Date:   Mon Feb 29 17:41:19 2016 +0100

    Remove slim patch
---
 debian/changelog               |  2 ++
 debian/patches/series          |  1 -
 debian/patches/slim-test.patch | 25 -------------------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24e378f..a83553c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ asciidoctor (1.5.4-1) unstable; urgency=medium
   * New upstream release
   * Patches refreshed:
     - lib_directory_in_tests.patch
+  * Patches removed (already applied upstream):
+    - slim-test.patch
 
  -- Guillaume Grossetie <ggrossetie at gmail.com>  Mon, 29 Feb 2016 17:18:00 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c6c9e0a..5cc23f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 data_path.patch
 lib_directory_in_tests.patch
 skip-asciimath-test.patch
-slim-test.patch
 package-version.patch
diff --git a/debian/patches/slim-test.patch b/debian/patches/slim-test.patch
deleted file mode 100644
index 4f598eb..0000000
--- a/debian/patches/slim-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix slim template loading wrt load order
- If Slim has been loaded before that point, an instance variable won't be set.
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: https://github.com/asciidoctor/asciidoctor/pull/1576
-Last-Update: 2015-11-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/asciidoctor/converter/template.rb
-+++ b/lib/asciidoctor/converter/template.rb
-@@ -253,10 +253,10 @@ module Asciidoctor
-           unless defined? ::Slim
-             # slim doesn't get loaded by Tilt, so we have to load it explicitly
-             Helpers.require_library 'slim'
--            if @safe && ::Slim::VERSION >= '3.0'
--              slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
--              slim_asciidoc_opts[:safe] ||= @safe
--            end
-+          end
-+          if @safe && ::Slim::VERSION >= '3.0'
-+            slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
-+            slim_asciidoc_opts[:safe] ||= @safe
-           end
-           # load include plugin when using Slim >= 2.1
-           require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'

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