[DRE-commits] r4297 - in trunk/soap4r/debian: . patches

[Ryan Niebur]

Author: ryan
Date: 2009-11-01 23:33:15 +0000 (Sun, 01 Nov 2009)
New Revision: 4297

Added:
   trunk/soap4r/debian/patches/fix_junk.patch
   trunk/soap4r/debian/patches/series
Modified:
   trunk/soap4r/debian/control
   trunk/soap4r/debian/rules
Log:
patch away some junk that looks useless and breaks ruby1.9

Modified: trunk/soap4r/debian/control
===================================================================
--- trunk/soap4r/debian/control	2009-11-01 23:26:50 UTC (rev 4296)
+++ trunk/soap4r/debian/control	2009-11-01 23:33:15 UTC (rev 4297)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ryan Niebur <ryan at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (> 7), ruby-pkg-tools, cdbs
+Build-Depends: debhelper (> 7), ruby-pkg-tools, cdbs, quilt
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/soap4r/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/soap4r/
 Standards-Version: 3.8.3

Added: trunk/soap4r/debian/patches/fix_junk.patch
===================================================================
--- trunk/soap4r/debian/patches/fix_junk.patch	                        (rev 0)
+++ trunk/soap4r/debian/patches/fix_junk.patch	2009-11-01 23:33:15 UTC (rev 4297)
@@ -0,0 +1,60 @@
+--- a/lib/xsd/charset.rb
++++ b/lib/xsd/charset.rb
+@@ -10,8 +10,6 @@
+ 
+ 
+ module Charset
+-  @internal_encoding = $KCODE
+-
+   class XSDError < StandardError; end
+   class CharsetError < XSDError; end
+   class UnknownCharsetError < CharsetError; end
+@@ -134,13 +132,11 @@
+   twobytes_euc = '(?:[\x8E\xA1-\xFE][\xA1-\xFE])'
+   threebytes_euc = '(?:\x8F[\xA1-\xFE][\xA1-\xFE])'
+   character_euc = "(?:#{us_ascii}|#{twobytes_euc}|#{threebytes_euc})"
+-  EUCRegexp = Regexp.new("\\A#{character_euc}*\\z", nil, 'NONE')
+ 
+   # onebyte_sjis = '[\x00-\x7F\xA1-\xDF]'
+   onebyte_sjis = '[\x9\xa\xd\x20-\x7F\xA1-\xDF]'	# XML 1.0 restricted.
+   twobytes_sjis = '(?:[\x81-\x9F\xE0-\xFC][\x40-\x7E\x80-\xFC])'
+   character_sjis = "(?:#{onebyte_sjis}|#{twobytes_sjis})"
+-  SJISRegexp = Regexp.new("\\A#{character_sjis}*\\z", nil, 'NONE')
+ 
+   # 0xxxxxxx
+   # 110yyyyy 10xxxxxx
+@@ -151,34 +147,15 @@
+   fourbytes_utf8 = '(?:[\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])'
+   character_utf8 =
+     "(?:#{us_ascii}|#{twobytes_utf8}|#{threebytes_utf8}|#{fourbytes_utf8})"
+-  UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", nil, 'NONE')
+ 
+   def Charset.is_us_ascii(str)
+     USASCIIRegexp =~ str
+   end
+ 
+-  def Charset.is_utf8(str)
+-    UTF8Regexp =~ str
+-  end
+-
+-  def Charset.is_euc(str)
+-    EUCRegexp =~ str
+-  end
+-
+-  def Charset.is_sjis(str)
+-    SJISRegexp =~ str
+-  end
+-
+   def Charset.is_ces(str, code = @internal_encoding)
+     case code
+     when 'NONE'
+       is_us_ascii(str)
+-    when 'UTF8'
+-      is_utf8(str)
+-    when 'EUC'
+-      is_euc(str)
+-    when 'SJIS'
+-      is_sjis(str)
+     else
+       raise UnknownCharsetError.new("Unknown charset: #{code}")
+     end

Added: trunk/soap4r/debian/patches/series
===================================================================
--- trunk/soap4r/debian/patches/series	                        (rev 0)
+++ trunk/soap4r/debian/patches/series	2009-11-01 23:33:15 UTC (rev 4297)
@@ -0,0 +1 @@
+fix_junk.patch

Modified: trunk/soap4r/debian/rules
===================================================================
--- trunk/soap4r/debian/rules	2009-11-01 23:26:50 UTC (rev 4296)
+++ trunk/soap4r/debian/rules	2009-11-01 23:33:15 UTC (rev 4297)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 ifeq ($(cdbs_ruby_ver), 1.8)
 DEB_RUBY_LIBDIR = $(strip $(shell ruby$(cdbs_ruby_ver) -rrbconfig -e 'puts Config::CONFIG["vendorlibdir"]'))