[DRE-commits] [SCM] ruby-asciidoctor.git branch, master, updated. upstream/0.1.1-8-g46a976d

[Per Andersson]

The following commit has been merged in the master branch:
commit d4701feba0485fa9caa1745234ac366d688b0bae
Author: Per Andersson <avtobiff at gmail.com>
Date:   Fri Jun 7 03:15:46 2013 +0200

    Refresh patches

diff --git a/debian/patches/0001-Do-not-use-pending-gem-in-tests.patch b/debian/patches/0001-Do-not-use-pending-gem-in-tests.patch
index c7007fe..ff79856 100644
--- a/debian/patches/0001-Do-not-use-pending-gem-in-tests.patch
+++ b/debian/patches/0001-Do-not-use-pending-gem-in-tests.patch
@@ -6,13 +6,11 @@ Subject: Do not use pending gem in tests
  test/test_helper.rb |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index 9e5f63b..585d4d1 100644
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
-@@ -11,7 +11,7 @@ rescue LoadError
- end
- require 'htmlentities'
+@@ -5,7 +5,7 @@
+ require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb"
+ 
  require 'nokogiri'
 -require 'pending'
 +#require 'pending'
diff --git a/debian/patches/0002-Comment-out-rubygems-require.patch b/debian/patches/0002-Comment-out-rubygems-require.patch
index 8917543..f468fee 100644
--- a/debian/patches/0002-Comment-out-rubygems-require.patch
+++ b/debian/patches/0002-Comment-out-rubygems-require.patch
@@ -6,13 +6,12 @@ Subject: Comment out rubygems require
  lib/asciidoctor.rb |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/lib/asciidoctor.rb b/lib/asciidoctor.rb
-index 57aedf4..7e8c9b5 100755
 --- a/lib/asciidoctor.rb
 +++ b/lib/asciidoctor.rb
-@@ -1,4 +1,4 @@
--require 'rubygems'
-+#require 'rubygems'
+@@ -1,5 +1,5 @@
+ if RUBY_VERSION < '1.9'
+-  require 'rubygems'
++#  require 'rubygems'
+ end
  require 'strscan'
- 
- $:.unshift(File.dirname(__FILE__))
+ require 'set'

-- 
ruby-asciidoctor.git