[DRE-commits] [SCM] sup-mail.git branch, master, updated. debian/0.12.1-1-31-g86c1bf1

[Per Andersson]

The following commit has been merged in the master branch:
commit 86c1bf14d15a4f822517e6ff0a4893fe96c31de6
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Jun 20 22:32:49 2012 +0200

    Add patch for using RbConfig instead of deprecated Config

diff --git a/debian/changelog b/debian/changelog
index bb0833f..0fd400f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,9 @@ sup-mail (0.12.1+git20120407.aaa852f-1) unstable; urgency=low
     - libxapian-ruby1.8 => libxapian-ruby1.9.1 (Closes: #555515)
   * Depend on ruby-locale instead of libgettext-ruby1.9.1.
     - Add patch for requiring iconv and locale instead of gettext.
+  * Add patch for using RbConfig instead of deprecated Config.
 
- -- Per Andersson <avtobiff at gmail.com>  Tue, 19 Jun 2012 00:00:15 +0200
+ -- Per Andersson <avtobiff at gmail.com>  Wed, 20 Jun 2012 22:32:24 +0200
 
 sup-mail (0.12.1-1) unstable; urgency=low
 
diff --git a/debian/patches/0006-Use-RbConfig-instead-of-deprecated-Config.patch b/debian/patches/0006-Use-RbConfig-instead-of-deprecated-Config.patch
new file mode 100644
index 0000000..b423ac4
--- /dev/null
+++ b/debian/patches/0006-Use-RbConfig-instead-of-deprecated-Config.patch
@@ -0,0 +1,22 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Wed, 20 Jun 2012 22:31:20 +0200
+Subject: Use RbConfig instead of deprecated Config
+
+---
+ bin/sup |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/sup b/bin/sup
+index ba67490..6ab45f0 100755
+--- a/bin/sup
++++ b/bin/sup
+@@ -117,7 +117,7 @@ end
+ require 'dl/import'
+ module LibC
+   extend DL.const_defined?(:Importer) ? DL::Importer : DL::Importable
+-  setlocale_lib = case Config::CONFIG['arch']
++  setlocale_lib = case RbConfig::CONFIG['arch']
+     when /darwin/; "libc.dylib"
+     when /cygwin/; "cygwin1.dll"
+     else; "libc.so.6"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 110bfab..5ca11c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Update-tests-so-they-all-pass.patch
 0004-Avoid-crash-when-maybe-wrapping-text.patch
 0005-Require-iconv-and-locale-instead-of-gettext.patch
+0006-Use-RbConfig-instead-of-deprecated-Config.patch

-- 
sup-mail.git