[DRE-commits] [SCM] ruby-bluecloth.git branch, master, updated. upstream/2.1.0-12-gde022a9
Cédric Boutillier
cedric.boutillier at gmail.com
Sat Aug 13 07:53:47 UTC 2011
The following commit has been merged in the master branch:
commit c1310653a844011aa3ffb298f2a71f93e9fd9708
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date: Sat Aug 13 09:51:58 2011 +0200
deactivate rubygems and $LOAD_PATH modifications in tests
diff --git a/debian/patches/01_tests_disable_rubygems.diff b/debian/patches/01_tests_disable_rubygems.diff
new file mode 100644
index 0000000..e649e82
--- /dev/null
+++ b/debian/patches/01_tests_disable_rubygems.diff
@@ -0,0 +1,38 @@
+Index: ruby-bluecloth/spec/contributions_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/contributions_spec.rb 2011-08-12 14:40:28.000000000 +0200
++++ ruby-bluecloth/spec/contributions_spec.rb 2011-08-12 14:40:34.000000000 +0200
+@@ -12,7 +12,7 @@
+ $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+-require 'rubygems'
++#require 'rubygems'
+ require 'rspec'
+ require 'bluecloth'
+
+Index: ruby-bluecloth/spec/discount_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/discount_spec.rb 2011-08-12 14:40:11.000000000 +0200
++++ ruby-bluecloth/spec/discount_spec.rb 2011-08-12 14:40:23.000000000 +0200
+@@ -13,7 +13,7 @@
+ $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+-require 'rubygems'
++#require 'rubygems'
+ require 'rspec'
+ require 'bluecloth'
+
+Index: ruby-bluecloth/spec/lib/matchers.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/lib/matchers.rb 2011-08-12 14:40:40.000000000 +0200
++++ ruby-bluecloth/spec/lib/matchers.rb 2011-08-12 14:40:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+
+-require 'rubygems'
++#require 'rubygems'
+ require 'bluecloth'
+
+ require 'tidy'
diff --git a/debian/patches/02_test_deactivate_BEGIN_headers.diff b/debian/patches/02_test_deactivate_BEGIN_headers.diff
new file mode 100644
index 0000000..97781f1
--- /dev/null
+++ b/debian/patches/02_test_deactivate_BEGIN_headers.diff
@@ -0,0 +1,304 @@
+Index: ruby-bluecloth/spec/discount_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/discount_spec.rb 2011-08-13 09:49:08.000000000 +0200
++++ ruby-bluecloth/spec/discount_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ #require 'rubygems'
+Index: ruby-bluecloth/spec/bluecloth_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/contributions_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/contributions_spec.rb 2011-08-13 09:49:08.000000000 +0200
++++ ruby-bluecloth/spec/contributions_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -7,9 +7,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ #require 'rubygems'
+Index: ruby-bluecloth/spec/bugfix_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bugfix_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bugfix_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'timeout'
+Index: ruby-bluecloth/spec/markdowntest_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/markdowntest_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/markdowntest_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -7,9 +7,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/titles_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/titles_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/titles_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/links_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/links_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/links_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,8 +8,8 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/images_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/images_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/images_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/blockquotes_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/blockquotes_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/blockquotes_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/entities_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/entities_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/entities_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/hrules_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/hrules_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/hrules_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/lists_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/lists_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/lists_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/autolinks_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/autolinks_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/autolinks_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/code_spans_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/code_spans_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/code_spans_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/emphasis_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/emphasis_spec.rb 2011-08-13 09:49:03.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/emphasis_spec.rb 2011-08-13 09:49:08.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/101_changes_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/101_changes_spec.rb 2011-08-13 09:49:23.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/101_changes_spec.rb 2011-08-13 09:49:32.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/inline_html_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/inline_html_spec.rb 2011-08-13 09:49:58.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/inline_html_spec.rb 2011-08-13 09:50:05.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
+Index: ruby-bluecloth/spec/bluecloth/paragraphs_spec.rb
+===================================================================
+--- ruby-bluecloth.orig/spec/bluecloth/paragraphs_spec.rb 2011-08-13 09:49:40.000000000 +0200
++++ ruby-bluecloth/spec/bluecloth/paragraphs_spec.rb 2011-08-13 09:49:46.000000000 +0200
+@@ -8,9 +8,9 @@
+ libdir = basedir + 'lib'
+ extdir = basedir + 'ext'
+
+- $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+- $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+- $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
++# $LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
++# $LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
++# $LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+ }
+
+ require 'rspec'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed56c54
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+
+01_tests_disable_rubygems.diff
+02_test_deactivate_BEGIN_headers.diff
--
ruby-bluecloth.git
More information about the Pkg-ruby-extras-commits
mailing list