Dear maintainer,

Attached patches make samidare to work with current sid ruby packages.
I test with these packages.

ii  ruby        1:2.0.0.1
ii  ruby-htree  0.8+dfsg-2

Best Regards,
Kouichi ONO

--- mconv.rb.org	2008-07-24 21:55:19.000000000 +0900
+++ mconv.rb	2014-04-02 21:39:30.176448762 +0900
@@ -25,7 +25,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 # OF SUCH DAMAGE.
 
-require 'iconv'
+#require 'iconv'
 
 module Mconv
   def Mconv.internal_mime_charset
@@ -50,30 +50,8 @@
   end
 
   def Mconv.conv(str, to, from)
-    ic = Iconv.new(to, from)
 
-    result = ''
-    rest = str
-    if rest.respond_to? :force_encoding
-      rest = rest.dup.force_encoding("ascii-8bit")
-    end
-
-    begin
-      s = ic.iconv(rest)
-      result << s
-    rescue Iconv::Failure
-      result << $!.success
-
-      rest = $!.failed
-
-      # following processing should be customizable by block?
-      result << '?'
-      rest = rest[1..-1]
-
-      retry
-    end
-
-    result << ic.close
+    result = str.encode(to, from, :invalid => :replace, :undef => :replace)
 
     result
   end
--- debian/control.org	2014-02-13 01:23:47.000000000 +0900
+++ debian/control	2014-03-28 23:34:40.183473806 +0900
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: NIIBE Yutaka <gni...@fsij.org>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: ruby (>= 1.8)
+Build-Depends-Indep: ruby
 Standards-Version: 3.8.0
 Homepage: http://www.a-k-r.org/samidare/
 
 Package: samidare
 Architecture: all
-Depends: libhtree-ruby1.8, libyaml-ruby1.8, libzlib-ruby1.8, ruby (>= 1.8), ruby1.8
+Depends: ruby-htree, ruby
 Description: web page updates checker
  Samidare makes it easy to keep up with your favorite weblogs or webpages in
  general.
--- debian/rules.org	2014-02-13 01:23:47.000000000 +0900
+++ debian/rules	2014-02-13 01:27:40.378750628 +0900
@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-RUBY := ruby1.8
+RUBY := ruby
 
 
 CFLAGS = -Wall -g

Reply via email to