[DRE-commits] [SCM] ruby-wikicloth.git branch, master, updated. debian/0.8.0_git.20130605.851eb9a-1-3-gc01b7cc

[Per Andersson]

The following commit has been merged in the master branch:
commit 504365e9598366e84e1159c9333f33a221e8eda0
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat Jun 8 20:39:46 2013 +0200

    Update debian patches

diff --git a/debian/patches/0001-Remove-rubygems-require.patch b/debian/patches/0001-Remove-rubygems-require.patch
index 261ffe2..9468e72 100644
--- a/debian/patches/0001-Remove-rubygems-require.patch
+++ b/debian/patches/0001-Remove-rubygems-require.patch
@@ -3,8 +3,9 @@ Date: Thu, 14 Mar 2013 03:13:37 +0100
 Subject: Remove rubygems require
 
 ---
- lib/wikicloth.rb |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ lib/wikicloth.rb    |    2 +-
+ test/test_helper.rb |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/wikicloth.rb b/lib/wikicloth.rb
 index 1fffc3b..bd1af7c 100644
@@ -16,3 +17,14 @@ index 1fffc3b..bd1af7c 100644
  require 'jcode' if RUBY_VERSION < '1.9'
  require 'builder'
  # if i18n gem loaded use it instead
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index 17e95cc..eb56fa7 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,5 +1,5 @@
+ 
+-require 'rubygems'
++#require 'rubygems'
+ gem "test-unit", ">= 2.0.5"
+ require 'active_support'
+ require 'active_support/test_case'
diff --git a/debian/patches/0002-Remove-gemspec-git-ls-files.patch b/debian/patches/0002-Remove-gemspec-git-ls-files.patch
index 303f854..8cd4b80 100644
--- a/debian/patches/0002-Remove-gemspec-git-ls-files.patch
+++ b/debian/patches/0002-Remove-gemspec-git-ls-files.patch
@@ -7,7 +7,7 @@ Subject: Remove gemspec git ls-files
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/wikicloth.gemspec b/wikicloth.gemspec
-index a08d2a8..bd5a8f3 100644
+index 83f977d..42fdbaa 100644
 --- a/wikicloth.gemspec
 +++ b/wikicloth.gemspec
 @@ -12,8 +12,8 @@ spec = Gem::Specification.new do |s|
diff --git a/debian/patches/0004-Remove-gem-explicit-versioning.patch b/debian/patches/0004-Remove-gem-explicit-versioning.patch
index 933bc27..a16665b 100644
--- a/debian/patches/0004-Remove-gem-explicit-versioning.patch
+++ b/debian/patches/0004-Remove-gem-explicit-versioning.patch
@@ -7,12 +7,12 @@ Subject: Remove gem explicit versioning
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/test_helper.rb b/test/test_helper.rb
-index 17e95cc..0151c00 100644
+index eb56fa7..fb6c091 100644
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
 @@ -1,6 +1,6 @@
  
- require 'rubygems'
+ #require 'rubygems'
 -gem "test-unit", ">= 2.0.5"
 +#gem "test-unit", ">= 2.0.5"
  require 'active_support'

-- 
ruby-wikicloth.git