[DRE-commits] [ruby-rchardet] 04/05: Drop upstream applied patches
zeha at debian.org
zeha at debian.org
Tue Jul 5 13:05:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
zeha pushed a commit to branch master
in repository ruby-rchardet.
commit b3398aea3b6b1c83e5ede7a951cc930e121303b1
Author: Christian Hofstaedtler <zeha at debian.org>
Date: Tue Jul 5 14:56:09 2016 +0200
Drop upstream applied patches
---
.../patches/remove-syntax-errors-for-ruby1.9.patch | 170 ---------------------
debian/patches/series | 1 -
2 files changed, 171 deletions(-)
diff --git a/debian/patches/remove-syntax-errors-for-ruby1.9.patch b/debian/patches/remove-syntax-errors-for-ruby1.9.patch
deleted file mode 100644
index 675886e..0000000
--- a/debian/patches/remove-syntax-errors-for-ruby1.9.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Description: Removes syntax errors from the source that are relevent for usages
- with Ruby 1.9.1.
-Author: Paul van Tilburg <paulvt at debian.org>
-Last-Update: 2011-11-08
-
-Index: ruby-rchardet/lib/rchardet/chardistribution.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/chardistribution.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/chardistribution.rb 2011-11-08 21:16:24.000000000 +0100
-@@ -57,8 +57,8 @@
- if order >= 0
- @_mTotalChars += 1
- # order is valid
-- if order < @_mTableSize:
-- if 512 > @_mCharToFreqOrder[order]:
-+ if order < @_mTableSize
-+ if 512 > @_mCharToFreqOrder[order]
- @_mFreqChars += 1
- end
- end
-@@ -72,7 +72,7 @@
- return SURE_NO
- end
-
-- if @_mTotalChars != @_mFreqChars:
-+ if @_mTotalChars != @_mFreqChars
- r = @_mFreqChars / ((@_mTotalChars - @_mFreqChars) * @_mTypicalDistributionRatio)
- if r < SURE_YES
- return r
-@@ -227,7 +227,7 @@
- # first byte range: 0xa0 -- 0xfe
- # second byte range: 0xa1 -- 0xfe
- # no validation needed here. State machine has done that
-- if aStr[0..0] >= "\xA0":
-+ if aStr[0..0] >= "\xA0"
- return 94 * (aStr[0] - 0xA1) + aStr[1] - 0xa1
- else
- return -1
-Index: ruby-rchardet/lib/rchardet/charsetgroupprober.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/charsetgroupprober.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/charsetgroupprober.rb 2011-11-08 21:16:44.000000000 +0100
-@@ -40,7 +40,7 @@
- super
- @_mActiveNum = 0
-
-- for prober in @_mProbers:
-+ for prober in @_mProbers
- if prober
- prober.reset()
- prober.active = true
-Index: ruby-rchardet/lib/rchardet/escprober.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/escprober.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/escprober.rb 2011-11-08 21:16:56.000000000 +0100
-@@ -41,7 +41,7 @@
-
- def reset
- super()
-- for codingSM in @_mCodingSM:
-+ for codingSM in @_mCodingSM
- next if not codingSM
- codingSM.active = true
- codingSM.reset()
-Index: ruby-rchardet/lib/rchardet/eucjpprober.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/eucjpprober.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/eucjpprober.rb 2011-11-08 21:17:10.000000000 +0100
-@@ -56,7 +56,7 @@
- elsif codingState == EItsMe
- @_mState = EFoundIt
- break
-- elsif codingState == EStart:
-+ elsif codingState == EStart
- charLen = @_mCodingSM.get_current_charlen()
- if i == 0
- @_mLastChar[1] = aBuf[0..0]
-Index: ruby-rchardet/lib/rchardet/jpcntx.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/jpcntx.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/jpcntx.rb 2011-11-08 21:17:30.000000000 +0100
-@@ -150,9 +150,9 @@
- @_mNeedToSkipCharNum = i - aLen
- @_mLastCharOrder = -1
- else
-- if (order != -1) and (@_mLastCharOrder != -1):
-+ if (order != -1) and (@_mLastCharOrder != -1)
- @_mTotalRel += 1
-- if @_mTotalRel > MAX_REL_THRESHOLD:
-+ if @_mTotalRel > MAX_REL_THRESHOLD
- @_mDone = true
- break
- end
-@@ -169,7 +169,7 @@
-
- def get_confidence
- # This is just one way to calculate confidence. It works well for me.
-- if @_mTotalRel > MINIMUM_DATA_THRESHOLD:
-+ if @_mTotalRel > MINIMUM_DATA_THRESHOLD
- return (@_mTotalRel - @_mRelSample[0]) / @_mTotalRel
- else
- return DONT_KNOW
-@@ -208,7 +208,7 @@
- return -1, 1 unless aStr
- # find out current char's byte length
- aStr = aStr[0..1].join if aStr.class == Array
-- if (aStr[0..0] == "\x8E") or ((aStr[0..0] >= "\xA1") and (aStr[0..0] <= "\xFE")):
-+ if (aStr[0..0] == "\x8E") or ((aStr[0..0] >= "\xA1") and (aStr[0..0] <= "\xFE"))
- charLen = 2
- elsif aStr[0..0] == "\x8F"
- charLen = 3
-Index: ruby-rchardet/lib/rchardet/sjisprober.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/sjisprober.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/sjisprober.rb 2011-11-08 21:17:45.000000000 +0100
-@@ -71,7 +71,7 @@
-
- @_mLastChar[0] = aBuf[aLen - 1.. aLen-1]
-
-- if get_state() == EDetecting:
-+ if get_state() == EDetecting
- if @_mContextAnalyzer.got_enough_data() and (get_confidence() > SHORTCUT_THRESHOLD)
- @_mState = EFoundIt
- end
-Index: ruby-rchardet/lib/rchardet/universaldetector.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/universaldetector.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/universaldetector.rb 2011-11-08 21:18:00.000000000 +0100
-@@ -91,11 +91,11 @@
- end
-
- @_mGotData = true
-- if @result['encoding'] and (@result['confidence'] > 0.0):
-+ if @result['encoding'] and (@result['confidence'] > 0.0)
- @done = true
- return
- end
-- if @_mInputState == EPureAscii:
-+ if @_mInputState == EPureAscii
- if @_highBitDetector =~ (aBuf)
- @_mInputState = EHighbyte
- elsif (@_mInputState == EPureAscii) and @_escDetector =~ (@_mLastChar + aBuf)
-@@ -138,12 +138,12 @@
- end
- @done = true
-
-- if @_mInputState == EPureAscii:
-+ if @_mInputState == EPureAscii
- @result = {'encoding' => 'ascii', 'confidence' => 1.0}
- return @result
- end
-
-- if @_mInputState == EHighbyte:
-+ if @_mInputState == EHighbyte
- confidences = {}
- @_mCharSetProbers.each{ |prober| confidences[prober] = prober.get_confidence }
- maxProber = @_mCharSetProbers.max{ |a,b| confidences[a] <=> confidences[b] }
-Index: ruby-rchardet/lib/rchardet/utf8prober.rb
-===================================================================
---- ruby-rchardet.orig/lib/rchardet/utf8prober.rb 2011-10-31 16:20:34.000000000 +0100
-+++ ruby-rchardet/lib/rchardet/utf8prober.rb 2011-11-08 21:18:13.000000000 +0100
-@@ -63,7 +63,7 @@
- end
- end
-
-- if get_state() == EDetecting:
-+ if get_state() == EDetecting
- if get_confidence() > SHORTCUT_THRESHOLD
- @_mState = EFoundIt
- end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ea7d158..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-remove-syntax-errors-for-ruby1.9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rchardet.git
More information about the Pkg-ruby-extras-commits
mailing list