[DRE-commits] [SCM] ruby-bluecloth.git branch, master, updated. debian/2.1.0-1-11-g7580dde

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 98c68e64e1b7baf6a0911eabc73d6b722c2afbb1
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Dec 21 23:50:03 2011 +0100

    drop 01_tests_disable_rubygems.diff, applied upstream

diff --git a/debian/changelog b/debian/changelog
index 6543181..aea5da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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.
 
  -- Cédric Boutillier <cedric.boutillier at gmail.com>  Wed, 21 Dec 2011 23:47:29 +0100
 
diff --git a/debian/patches/01_tests_disable_rubygems.diff b/debian/patches/01_tests_disable_rubygems.diff
deleted file mode 100644
index 9ca9664..0000000
--- a/debian/patches/01_tests_disable_rubygems.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Removes the occurences of "require 'rubygems'" in tests
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2011-08-13
-
-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/series b/debian/patches/series
index ed56c54..0f38897 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-
-01_tests_disable_rubygems.diff
 02_test_deactivate_BEGIN_headers.diff

-- 
ruby-bluecloth.git