[DRE-commits] [sup-mail] 25/26: Refresh Remove LOADPATH mangling patch

[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 4e12d4b082f43fa8b6c10f71127aa0eddd3b2e88
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sun Nov 3 21:13:57 2013 +0100

    Refresh Remove LOADPATH mangling patch
---
 debian/changelog                                   |  1 +
 debian/patches/0001-Remove-LOADPATH-mangling.patch | 36 +++++-----------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83fb273..c2eb2bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ sup-mail (0.14.0~git.20130822.aa37476-1) UNRELEASED; urgency=low
         - sup-cmd.1
         - sup-server.1
       - Modify watch file
+  * Refresh Remove LOADPATH mangling patch
   * Drop patches merged or fixed upstream
     - Patch out all requires of rubygems (nop in ruby > 1.8)
     - Fix support for gpgme 2.0
diff --git a/debian/patches/0001-Remove-LOADPATH-mangling.patch b/debian/patches/0001-Remove-LOADPATH-mangling.patch
index 6ba04a4..f2ed1b9 100644
--- a/debian/patches/0001-Remove-LOADPATH-mangling.patch
+++ b/debian/patches/0001-Remove-LOADPATH-mangling.patch
@@ -15,8 +15,6 @@ Subject: Remove LOADPATH mangling
  bin/sup-tweak-labels           | 2 +-
  10 files changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/bin/sup b/bin/sup
-index 4fc078c..484b90d 100755
 --- a/bin/sup
 +++ b/bin/sup
 @@ -1,7 +1,7 @@
@@ -26,10 +24,8 @@ index 4fc078c..484b90d 100755
 -$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
- #require 'rubygems'
+ require 'rubygems'
  
-diff --git a/bin/sup-add b/bin/sup-add
-index 0f52409..3265f5a 100755
 --- a/bin/sup-add
 +++ b/bin/sup-add
 @@ -1,6 +1,6 @@
@@ -39,9 +35,7 @@ index 0f52409..3265f5a 100755
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
  require 'uri'
- #require 'rubygems'
-diff --git a/bin/sup-config b/bin/sup-config
-index 8d311d0..fb468d7 100755
+ require 'rubygems'
 --- a/bin/sup-config
 +++ b/bin/sup-config
 @@ -1,6 +1,6 @@
@@ -50,10 +44,8 @@ index 8d311d0..fb468d7 100755
 -$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
- #require 'rubygems'
+ require 'rubygems'
  require 'highline/import'
-diff --git a/bin/sup-dump b/bin/sup-dump
-index 8261ecd..a0e316e 100755
 --- a/bin/sup-dump
 +++ b/bin/sup-dump
 @@ -1,6 +1,6 @@
@@ -62,10 +54,8 @@ index 8261ecd..a0e316e 100755
 -$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
- #require 'rubygems'
+ require 'rubygems'
  require 'xapian'
-diff --git a/bin/sup-import-dump b/bin/sup-import-dump
-index d10a378..3e3cc58 100755
 --- a/bin/sup-import-dump
 +++ b/bin/sup-import-dump
 @@ -1,6 +1,6 @@
@@ -75,9 +65,7 @@ index d10a378..3e3cc58 100755
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
  require 'uri'
- #require 'rubygems'
-diff --git a/bin/sup-psych-ify-config-files b/bin/sup-psych-ify-config-files
-index c023169..05164be 100755
+ require 'rubygems'
 --- a/bin/sup-psych-ify-config-files
 +++ b/bin/sup-psych-ify-config-files
 @@ -1,6 +1,6 @@
@@ -88,8 +76,6 @@ index c023169..05164be 100755
  
  require "sup"
  require "fileutils"
-diff --git a/bin/sup-recover-sources b/bin/sup-recover-sources
-index 2d62c32..bea0ffb 100755
 --- a/bin/sup-recover-sources
 +++ b/bin/sup-recover-sources
 @@ -1,6 +1,6 @@
@@ -100,8 +86,6 @@ index 2d62c32..bea0ffb 100755
  
  require 'optparse'
  
-diff --git a/bin/sup-sync b/bin/sup-sync
-index 630df3c..ceef1ae 100755
 --- a/bin/sup-sync
 +++ b/bin/sup-sync
 @@ -1,6 +1,6 @@
@@ -111,9 +95,7 @@ index 630df3c..ceef1ae 100755
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
  require 'uri'
- #require 'rubygems'
-diff --git a/bin/sup-sync-back b/bin/sup-sync-back
-index 35ea547..d9f6c97 100755
+ require 'rubygems'
 --- a/bin/sup-sync-back
 +++ b/bin/sup-sync-back
 @@ -1,6 +1,6 @@
@@ -122,10 +104,8 @@ index 35ea547..d9f6c97 100755
 -$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
- #require 'rubygems'
+ require 'rubygems'
  require 'uri'
-diff --git a/bin/sup-tweak-labels b/bin/sup-tweak-labels
-index 58162c6..a9e6cb9 100755
 --- a/bin/sup-tweak-labels
 +++ b/bin/sup-tweak-labels
 @@ -1,6 +1,6 @@
@@ -134,5 +114,5 @@ index 58162c6..a9e6cb9 100755
 -$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 +#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
  
- #require 'rubygems'
+ require 'rubygems'
  require 'trollop'

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