[DRE-commits] [sup-mail] 13/26: Refresh patch that removes all require rubygems
Per Andersson
avtobiff at moszumanska.debian.org
Wed Oct 1 19:02:20 UTC 2014
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 22ade711ce6cf325b8210e18b41bd398621277d3
Author: Per Andersson <avtobiff at gmail.com>
Date: Thu Aug 22 22:53:04 2013 +0200
Refresh patch that removes all require rubygems
---
.../0001-Patch-out-all-requires-of-rubygems.patch | 157 +++++++++++----------
1 file changed, 86 insertions(+), 71 deletions(-)
diff --git a/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch b/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch
index a9d96a2..4bfdadd 100644
--- a/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch
+++ b/debian/patches/0001-Patch-out-all-requires-of-rubygems.patch
@@ -1,75 +1,68 @@
From: Per Andersson <avtobiff at gmail.com>
Date: Mon, 9 Apr 2012 14:11:56 +0200
-Subject: Patch out all requires of rubygems.
+Subject: Patch out all requires of rubygems
---
- bin/sup | 2 +-
- bin/sup-add | 2 +-
- bin/sup-cmd | 2 +-
- bin/sup-config | 2 +-
- bin/sup-dump | 2 +-
- bin/sup-import-dump | 2 +-
- bin/sup-server | 2 +-
- bin/sup-sync | 2 +-
- bin/sup-sync-back | 2 +-
- bin/sup-tweak-labels | 2 +-
- lib/sup.rb | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
+ 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 ad7a0d1..ba67490 100755
+index ca1071a..4fc078c 100755
--- a/bin/sup
+++ b/bin/sup
-@@ -1,6 +1,6 @@
- #!/usr/bin/env ruby
+@@ -3,7 +3,7 @@
+
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require 'rubygems'
+#require 'rubygems'
- no_ncursesw = false
- begin
+ require 'ncursesw'
+
diff --git a/bin/sup-add b/bin/sup-add
-index c77720f..89147b4 100755
+index eae893f..0f52409 100755
--- a/bin/sup-add
+++ b/bin/sup-add
-@@ -1,7 +1,7 @@
- #!/usr/bin/env ruby
+@@ -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"; Redwood::check_library_version_against "git"
-diff --git a/bin/sup-cmd b/bin/sup-cmd
-index 8ec5c69..62874f3 100755
---- a/bin/sup-cmd
-+++ b/bin/sup-cmd
-@@ -1,5 +1,5 @@
- #!/usr/bin/env ruby
--require 'rubygems'
-+#require 'rubygems'
- require 'trollop'
- require 'sup'
- require 'sup/client'
+ require "sup"
diff --git a/bin/sup-config b/bin/sup-config
-index c4a64a3..9fa5c53 100755
+index 2cd3765..8d311d0 100755
--- a/bin/sup-config
+++ b/bin/sup-config
-@@ -1,6 +1,6 @@
- #!/usr/bin/env ruby
+@@ -2,7 +2,7 @@
+
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require 'rubygems'
+#require 'rubygems'
require 'highline/import'
- require 'yaml'
require 'trollop'
+ require "sup"
diff --git a/bin/sup-dump b/bin/sup-dump
-index 4908b18..a163d90 100755
+index 271a982..8261ecd 100755
--- a/bin/sup-dump
+++ b/bin/sup-dump
-@@ -1,6 +1,6 @@
- #!/usr/bin/env ruby
+@@ -2,7 +2,7 @@
+
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require 'rubygems'
+#require 'rubygems'
@@ -77,48 +70,38 @@ index 4908b18..a163d90 100755
require 'trollop'
require 'set'
diff --git a/bin/sup-import-dump b/bin/sup-import-dump
-index 91a1721..b1916da 100755
+index bde1723..d10a378 100755
--- a/bin/sup-import-dump
+++ b/bin/sup-import-dump
-@@ -1,7 +1,7 @@
- #!/usr/bin/env ruby
+@@ -3,7 +3,7 @@
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
require 'uri'
-require 'rubygems'
+#require 'rubygems'
require 'trollop'
- require "sup"; Redwood::check_library_version_against "git"
-
-diff --git a/bin/sup-server b/bin/sup-server
-index aeec37c..9e9dd43 100755
---- a/bin/sup-server
-+++ b/bin/sup-server
-@@ -1,5 +1,5 @@
- #!/usr/bin/env ruby
--require 'rubygems'
-+#require 'rubygems'
- require 'trollop'
- require 'sup'
- require 'sup/server'
+ require "sup"
+
diff --git a/bin/sup-sync b/bin/sup-sync
-index b4d5cba..4df4b78 100755
+index ee6d932..630df3c 100755
--- a/bin/sup-sync
+++ b/bin/sup-sync
-@@ -1,7 +1,7 @@
- #!/usr/bin/env ruby
+@@ -3,7 +3,7 @@
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
require 'uri'
-require 'rubygems'
+#require 'rubygems'
require 'trollop'
- require "sup"; Redwood::check_library_version_against "git"
+ require "sup"
diff --git a/bin/sup-sync-back b/bin/sup-sync-back
-index 5d84cba..4cc02ea 100755
+index de4e869..35ea547 100755
--- a/bin/sup-sync-back
+++ b/bin/sup-sync-back
-@@ -1,6 +1,6 @@
- #!/usr/bin/env ruby
+@@ -2,7 +2,7 @@
+
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require 'rubygems'
+#require 'rubygems'
@@ -126,25 +109,57 @@ index 5d84cba..4cc02ea 100755
require 'tempfile'
require 'trollop'
diff --git a/bin/sup-tweak-labels b/bin/sup-tweak-labels
-index 076c802..e96b977 100755
+index 36947d5..58162c6 100755
--- a/bin/sup-tweak-labels
+++ b/bin/sup-tweak-labels
-@@ -1,6 +1,6 @@
- #!/usr/bin/env ruby
+@@ -2,7 +2,7 @@
+
+ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require 'rubygems'
+#require 'rubygems'
require 'trollop'
- require "sup"; Redwood::check_library_version_against "git"
+ 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 74d5cde..9a4064d 100644
+index 4fb4118..9f8e3be 100644
--- a/lib/sup.rb
+++ b/lib/sup.rb
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,6 @@
+ # encoding: utf-8
+
-require 'rubygems'
+#require 'rubygems'
- require 'syck'
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"
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/sup-mail.git
More information about the Pkg-ruby-extras-commits
mailing list