[DRE-commits] [SCM] ruby-subexec.git branch, master, updated. debian/0.2.2-1-4-g1131cb2

[markus tornow]

The following commit has been merged in the master branch:
commit b05fd7484eabaefe8fec21ba588724008835fac7
Author: markus tornow <tornow at riseup.net>
Date:   Mon May 20 18:39:29 2013 +0200

    removing corect-wrong-export-LANG-syntax patch,implemented in upstream

diff --git a/debian/patches/correct-wrong-export-LANG-syntax b/debian/patches/correct-wrong-export-LANG-syntax
deleted file mode 100644
index 2628447..0000000
--- a/debian/patches/correct-wrong-export-LANG-syntax
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix exporting of LANG setting for Unix platforms
-Author: Diego Elio Pettenò <flameeyes at flameeyes.eu>                
-Origin: https://github.com/Flameeyes/subexec/commit/7911bff90ef1328634911bfe2d94864209ff379d
-Forwarded: not-needed
-Last-Update: 2012-04-30
----
- lib/subexec.rb |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/subexec.rb b/lib/subexec.rb
-index 2bbbf69..28c5092 100644
---- a/lib/subexec.rb
-+++ b/lib/subexec.rb
-@@ -117,7 +117,7 @@ def exec
-       if !(RUBY_PLATFORM =~ /win32|mswin|mingw/).nil?
-         self.output = `set LANG=#{lang} && #{command} 2>&1`
-       else
--        self.output = `LANG=#{lang} && export $LANG && #{command} 2>&1`
-+        self.output = `LANG=#{lang} && export LANG && #{command} 2>&1`
-       end
-       self.exitstatus = $?.exitstatus
-     end
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index 54f7532..4a4f712 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-correct-wrong-export-LANG-syntax
 remove-bundler

-- 
ruby-subexec.git