[DRE-commits] [ruby-wikicloth] 02/05: Remove obsolete patches

[Per Andersson]

This is an automated email from the git hooks/post-receive script.

avtobiff pushed a commit to branch master
in repository ruby-wikicloth.

commit 61c52229a77e7eba1cace0aefd4028b2a3249864
Author: Per Andersson <avtobiff at gmail.com>
Date:   Fri Oct 9 21:27:11 2015 +0200

    Remove obsolete patches
    
    - Comment out rubygems requires
    - Explicit gem versioning
    - Rearrange test/unit require
---
 debian/changelog                                   |  4 +++
 debian/patches/0001-Remove-rubygems-require.patch  | 30 ----------------------
 .../0004-Remove-gem-explicit-versioning.patch      | 20 ---------------
 .../patches/0006-Rearrange-test-unit-require.patch | 24 -----------------
 debian/patches/series                              |  3 ---
 5 files changed, 4 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aa653f..96f7b57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ ruby-wikicloth (0.8.1+dfsg-3) UNRELEASED; urgency=medium
 
   [Per Andersson]
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Remove obsolete patches
+    - Comment out rubygems requires
+    - Explicit gem versioning
+    - Rearrange test/unit require
 
  -- Sebastien Badia <seb at sebian.fr>  Wed, 08 Apr 2015 18:18:00 +0200
 
diff --git a/debian/patches/0001-Remove-rubygems-require.patch b/debian/patches/0001-Remove-rubygems-require.patch
deleted file mode 100644
index 9468e72..0000000
--- a/debian/patches/0001-Remove-rubygems-require.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Thu, 14 Mar 2013 03:13:37 +0100
-Subject: Remove rubygems require
-
----
- 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
---- a/lib/wikicloth.rb
-+++ b/lib/wikicloth.rb
-@@ -1,4 +1,4 @@
--require 'rubygems' if RUBY_VERSION < '1.9'
-+#require 'rubygems' if RUBY_VERSION < '1.9'
- 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/0004-Remove-gem-explicit-versioning.patch b/debian/patches/0004-Remove-gem-explicit-versioning.patch
deleted file mode 100644
index a16665b..0000000
--- a/debian/patches/0004-Remove-gem-explicit-versioning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sun, 17 Mar 2013 23:36:33 +0100
-Subject: Remove gem explicit versioning
-
----
- 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 eb56fa7..fb6c091 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,6 +1,6 @@
- 
- #require 'rubygems'
--gem "test-unit", ">= 2.0.5"
-+#gem "test-unit", ">= 2.0.5"
- require 'active_support'
- require 'active_support/test_case'
- require 'test/unit'
diff --git a/debian/patches/0006-Rearrange-test-unit-require.patch b/debian/patches/0006-Rearrange-test-unit-require.patch
deleted file mode 100644
index c8dfd69..0000000
--- a/debian/patches/0006-Rearrange-test-unit-require.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Thu, 27 Feb 2014 01:19:44 +0100
-Subject: Rearrange test/unit require
-
-The require active_support/test_case needs test/unit to be required
-first.
----
- 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 fb6c091..a73cd8d 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,8 +1,8 @@
- 
- #require 'rubygems'
- #gem "test-unit", ">= 2.0.5"
-+require 'test/unit'
- require 'active_support'
- require 'active_support/test_case'
--require 'test/unit'
- I18n.load_path << File.join(File.dirname(__FILE__),'locales.yml')
- require File.join(File.dirname(__FILE__),'../init')
diff --git a/debian/patches/series b/debian/patches/series
index 942da24..6149554 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-0001-Remove-rubygems-require.patch
 0002-Remove-gemspec-git-ls-files.patch
 0003-Ignore-code-coverage-test.patch
-0004-Remove-gem-explicit-versioning.patch
 0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
-0006-Rearrange-test-unit-require.patch
 0007-Require-wikicloth-in-examples.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-wikicloth.git