[DRE-commits] [SCM] ruby-bluecloth.git branch, master, updated. debian/2.1.0-1-11-g7580dde
Cédric Boutillier
cedric.boutillier at gmail.com
Wed Dec 21 23:39:52 UTC 2011
The following commit has been merged in the master branch:
commit 60b5b7bbe24ecf1f7e6be99846ef4041cff9c961
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date: Thu Dec 22 00:17:21 2011 +0100
refresh 02_test_deactivate_BEGIN_headers.diff
diff --git a/debian/changelog b/debian/changelog
index aea5da8..f92eebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-bluecloth (2.2.0-1) unstable; urgency=low
* New upstream release.
* Upstream now ships a manpage. Using it instead of generating one.
* Drop 01_tests_disable_rubygems.diff, applied upstream.
+ * Refresh 02_test_deactivate_BEGIN_headers.diff, partially applied upstream.
-- Cédric Boutillier <cedric.boutillier at gmail.com> Wed, 21 Dec 2011 23:47:29 +0100
diff --git a/debian/patches/02_test_deactivate_BEGIN_headers.diff b/debian/patches/02_test_deactivate_BEGIN_headers.diff
index a2851dc..e3c06ba 100644
--- a/debian/patches/02_test_deactivate_BEGIN_headers.diff
+++ b/debian/patches/02_test_deactivate_BEGIN_headers.diff
@@ -8,307 +8,235 @@ Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Last-Update: 2011-08-13
-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 @@
+--- a/spec/discount_spec.rb
++++ b/spec/discount_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+ require 'rspec'
+--- a/spec/bluecloth_spec.rb
++++ b/spec/bluecloth_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/contributions_spec.rb
++++ b/spec/contributions_spec.rb
+@@ -6,8 +6,8 @@
+
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 @@
+ require 'rspec'
+--- a/spec/bugfix_spec.rb
++++ b/spec/bugfix_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/markdowntest_spec.rb
++++ b/spec/markdowntest_spec.rb
+@@ -6,8 +6,8 @@
+
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 @@
+--- a/spec/bluecloth/titles_spec.rb
++++ b/spec/bluecloth/titles_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/links_spec.rb
++++ b/spec/bluecloth/links_spec.rb
+@@ -7,7 +7,7 @@
+
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 @@
+--- a/spec/bluecloth/images_spec.rb
++++ b/spec/bluecloth/images_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/blockquotes_spec.rb
++++ b/spec/bluecloth/blockquotes_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/entities_spec.rb
++++ b/spec/bluecloth/entities_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/hrules_spec.rb
++++ b/spec/bluecloth/hrules_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/lists_spec.rb
++++ b/spec/bluecloth/lists_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/autolinks_spec.rb
++++ b/spec/bluecloth/autolinks_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/code_spans_spec.rb
++++ b/spec/bluecloth/code_spans_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/emphasis_spec.rb
++++ b/spec/bluecloth/emphasis_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/101_changes_spec.rb
++++ b/spec/bluecloth/101_changes_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/inline_html_spec.rb
++++ b/spec/bluecloth/inline_html_spec.rb
+@@ -7,8 +7,8 @@
+
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 @@
+--- a/spec/bluecloth/paragraphs_spec.rb
++++ b/spec/bluecloth/paragraphs_spec.rb
+@@ -7,8 +7,8 @@
+
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'
--
ruby-bluecloth.git
More information about the Pkg-ruby-extras-commits
mailing list