[DRE-commits] [sup-mail] 03/04: Remove obsolete patch commenting out rubygems imports

[Per Andersson]

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

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

commit 314bf5172c946df9586bc3ed3007fc4cfe43cb87
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Oct 7 16:17:21 2015 +0200

    Remove obsolete patch commenting out rubygems imports
---
 debian/changelog                                   |   3 +-
 .../0001-Patch-out-all-requires-of-rubygems.patch  | 114 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 2 insertions(+), 116 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed972db..31e5d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ sup-mail (0.22.1-1) UNRELEASED; urgency=low
 
   * New upstream release. (Closes: #796054, #789605, #766168, #764315)
   * Added script for regenerating man pages from upstream.
+  * Removed obsolete patch for commenting out rubygems imports.
 
- -- Per Andersson <avtobiff at debian.org>  Tue, 07 Oct 2014 12:55:51 +0200
+ -- Per Andersson <avtobiff at debian.org>  Wed, 07 Oct 2015 16:18:41 +0200
 
 sup-mail (0.20.0-1) unstable; urgency=low
 
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 ff44097..0000000
--- a/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch
+++ /dev/null
@@ -1,114 +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-maildir    |    2 +-
- bin/sup-tweak-labels         |    2 +-
- lib/sup.rb                   |    2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
---- a/bin/sup
-+++ b/bin/sup
-@@ -3,7 +3,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'ncursesw'
- 
- require 'sup/util/ncurses'
---- 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"
---- 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"
---- 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'
---- 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"
- 
---- 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"
- 
---- 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"
- 
---- a/bin/sup-sync-back-maildir
-+++ b/bin/sup-sync-back-maildir
-@@ -3,7 +3,7 @@
- 
- $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'trollop'
- require "sup"
- 
---- a/lib/sup.rb
-+++ b/lib/sup.rb
-@@ -1,6 +1,6 @@
- # encoding: utf-8
- 
--require 'rubygems'
-+#require 'rubygems'
- require 'yaml'
- require 'zlib'
- require 'thread'
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9fb5e07..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Patch-out-all-requires-of-rubygems.patch

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