[DRE-commits] [sup-mail] 24/26: Remove patch out require rubygems, nop in ruby > 1.8

[Per Andersson]

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

avtobiff pushed a commit to branch next-0.14.1.1
in repository sup-mail.

commit 829bcd18e138bce897d091656447b3f8544d8a17
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sun Nov 3 20:56:41 2013 +0100

    Remove patch out require rubygems, nop in ruby > 1.8
---
 debian/changelog                                   |   3 +-
 .../0001-Patch-out-all-requires-of-rubygems.patch  | 165 ---------------------
 ...g.patch => 0001-Remove-LOADPATH-mangling.patch} |   0
 debian/patches/series                              |   3 +-
 4 files changed, 2 insertions(+), 169 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c1fbb1..83fb273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,8 @@ sup-mail (0.14.0~git.20130822.aa37476-1) UNRELEASED; urgency=low
         - sup-cmd.1
         - sup-server.1
       - Modify watch file
-  * Refresh patch
-    - Patch out all requires of rubygems
   * Drop patches merged or fixed upstream
+    - Patch out all requires of rubygems (nop in ruby > 1.8)
     - Fix support for gpgme 2.0
     - Update tests so they all pass
     - Avoid crash when maybe wrapping text (Closes: #683781)
diff --git a/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch b/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch
deleted file mode 100644
index 4bfdadd..0000000
--- a/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Mon, 9 Apr 2012 14:11:56 +0200
-Subject: Patch out all requires of rubygems
-
----
- bin/sup                | 2 +-
- bin/sup-add            | 2 +-
- bin/sup-config         | 2 +-
- bin/sup-dump           | 2 +-
- bin/sup-import-dump    | 2 +-
- bin/sup-sync           | 2 +-
- bin/sup-sync-back      | 2 +-
- bin/sup-tweak-labels   | 2 +-
- contrib/colorpicker.rb | 2 +-
- devel/profile.rb       | 2 +-
- lib/sup.rb             | 2 +-
- test/test_helper.rb    | 2 +-
- 12 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/bin/sup b/bin/sup
-index ca1071a..4fc078c 100755
---- a/bin/sup
-+++ b/bin/sup
-@@ -3,7 +3,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- 
- require 'ncursesw'
- 
-diff --git a/bin/sup-add b/bin/sup-add
-index eae893f..0f52409 100755
---- a/bin/sup-add
-+++ b/bin/sup-add
-@@ -3,7 +3,7 @@
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
- require 'uri'
--require 'rubygems'
-+#require 'rubygems'
- require 'highline/import'
- require 'trollop'
- require "sup"
-diff --git a/bin/sup-config b/bin/sup-config
-index 2cd3765..8d311d0 100755
---- a/bin/sup-config
-+++ b/bin/sup-config
-@@ -2,7 +2,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'highline/import'
- require 'trollop'
- require "sup"
-diff --git a/bin/sup-dump b/bin/sup-dump
-index 271a982..8261ecd 100755
---- a/bin/sup-dump
-+++ b/bin/sup-dump
-@@ -2,7 +2,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'xapian'
- require 'trollop'
- require 'set'
-diff --git a/bin/sup-import-dump b/bin/sup-import-dump
-index bde1723..d10a378 100755
---- a/bin/sup-import-dump
-+++ b/bin/sup-import-dump
-@@ -3,7 +3,7 @@
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
- require 'uri'
--require 'rubygems'
-+#require 'rubygems'
- require 'trollop'
- require "sup"
- 
-diff --git a/bin/sup-sync b/bin/sup-sync
-index ee6d932..630df3c 100755
---- a/bin/sup-sync
-+++ b/bin/sup-sync
-@@ -3,7 +3,7 @@
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
- require 'uri'
--require 'rubygems'
-+#require 'rubygems'
- require 'trollop'
- require "sup"
- 
-diff --git a/bin/sup-sync-back b/bin/sup-sync-back
-index de4e869..35ea547 100755
---- a/bin/sup-sync-back
-+++ b/bin/sup-sync-back
-@@ -2,7 +2,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'uri'
- require 'tempfile'
- require 'trollop'
-diff --git a/bin/sup-tweak-labels b/bin/sup-tweak-labels
-index 36947d5..58162c6 100755
---- a/bin/sup-tweak-labels
-+++ b/bin/sup-tweak-labels
-@@ -2,7 +2,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'trollop'
- require "sup"
- 
-diff --git a/contrib/colorpicker.rb b/contrib/colorpicker.rb
-index 947b3d5..de38890 100644
---- a/contrib/colorpicker.rb
-+++ b/contrib/colorpicker.rb
-@@ -1,4 +1,4 @@
--require 'rubygems'
-+#require 'rubygems'
- 
- require 'ncursesw'
- 
-diff --git a/devel/profile.rb b/devel/profile.rb
-index 67b6b08..83d5d3a 100644
---- a/devel/profile.rb
-+++ b/devel/profile.rb
-@@ -1,4 +1,4 @@
--require 'rubygems'
-+#require 'rubygems'
- require 'ruby-prof'
- require "redwood"
- 
-diff --git a/lib/sup.rb b/lib/sup.rb
-index 4fb4118..9f8e3be 100644
---- a/lib/sup.rb
-+++ b/lib/sup.rb
-@@ -1,6 +1,6 @@
- # encoding: utf-8
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'yaml'
- YAML::ENGINE.yamler = 'psych'
- require 'zlib'
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index adb09b7..59fa8b0 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,4 +1,4 @@
--require "rubygems" rescue nil
-+#require "rubygems" rescue nil
- require 'minitest/autorun'
- require "rr"
- 
diff --git a/debian/patches/0002-Remove-LOADPATH-mangling.patch b/debian/patches/0001-Remove-LOADPATH-mangling.patch
similarity index 100%
rename from debian/patches/0002-Remove-LOADPATH-mangling.patch
rename to debian/patches/0001-Remove-LOADPATH-mangling.patch
diff --git a/debian/patches/series b/debian/patches/series
index ff51db4..1996b65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Patch-out-all-requires-of-rubygems.patch
-0002-Remove-LOADPATH-mangling.patch
+0001-Remove-LOADPATH-mangling.patch

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