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

[Per Andersson]

The following commit has been merged in the master branch:
commit 863183309837b3574f9741c63e456719102fc0b3
Author: Per Andersson <avtobiff at gmail.com>
Date:   Tue Jun 19 00:01:54 2012 +0200

    Depend on ruby-locale instead of libgettext-ruby1.9.1
    
    Add patch for requiring iconv and locale instead of gettext.

diff --git a/debian/changelog b/debian/changelog
index 8cdd82a..7ad289d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,10 +41,11 @@ sup-mail (0.12.1+git20120407.aaa852f-1) unstable; urgency=low
     - libncurses-ruby => ruby-ncurses
     - librmail-ruby1.8 => ruby-rubymail
     - libtrollop-ruby => ruby-trollop
-    - libgettext-ruby1.8 => libgettext-ruby1.9.1
     - libxapian-ruby1.8 => libxapian-ruby1.9.1
+  * Depend on ruby-locale instead of libgettext-ruby1.9.1.
+    - Add patch for requiring iconv and locale instead of gettext.
 
- -- Per Andersson <avtobiff at gmail.com>  Wed, 06 Jun 2012 20:27:06 +0200
+ -- Per Andersson <avtobiff at gmail.com>  Tue, 19 Jun 2012 00:00:15 +0200
 
 sup-mail (0.12.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 41b1957..48c68c0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 7.0.50~),
  gem2deb (>= 0.2.13~),
- libgettext-ruby1.9.1,
  libxapian-ruby1.9.1 (>= 1.2.1),
  ruby-chronic,
  ruby-eventmachine,
  ruby-highline,
+ ruby-locale,
  ruby-lockfile,
  ruby-mime-types,
  ruby-ncurses,
@@ -29,11 +29,11 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends:
  ruby1.9.1,
- libgettext-ruby1.9.1,
  libxapian-ruby1.9.1 (>= 1.2.1),
  ruby-chronic,
  ruby-eventmachine,
  ruby-highline,
+ ruby-locale,
  ruby-lockfile,
  ruby-mime-types,
  ruby-ncurses,
diff --git a/debian/patches/0005-Require-iconv-and-locale-instead-of-gettext.patch b/debian/patches/0005-Require-iconv-and-locale-instead-of-gettext.patch
new file mode 100644
index 0000000..6b0f4ae
--- /dev/null
+++ b/debian/patches/0005-Require-iconv-and-locale-instead-of-gettext.patch
@@ -0,0 +1,23 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Mon, 18 Jun 2012 23:58:19 +0200
+Subject: Require iconv and locale instead of gettext
+
+---
+ lib/sup.rb |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/lib/sup.rb b/lib/sup.rb
+index 9a4064d..f03b99e 100644
+--- a/lib/sup.rb
++++ b/lib/sup.rb
+@@ -4,7 +4,8 @@ require 'yaml'
+ require 'zlib'
+ require 'thread'
+ require 'fileutils'
+-require 'gettext'
++require 'iconv'
++require 'locale'
+ require 'curses'
+ require 'rmail'
+ begin
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 6150ef3..110bfab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-support-for-gpgme-2.0.patch
 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

-- 
sup-mail.git