[DRE-commits] [bsfilter] 03/05: Update patches for new upstream version

Christian Hofstaedtler zeha at moszumanska.debian.org
Sun Dec 22 17:44:57 UTC 2013 

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository bsfilter.

commit 9c2786cc6f2862f7acc19f754a5bc17770a6b64a
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sun Dec 22 18:34:54 2013 +0100

    Update patches for new upstream version
---
 debian/patches/000_debian-changes-1:1.0.17-1 | 34 ----------------------------
 debian/patches/010_disable_chasen            | 28 +++++++++++++----------
 debian/patches/020_disable_bdb1              | 28 +++++++++++++----------
 debian/patches/series                        |  1 -
 4 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/debian/patches/000_debian-changes-1:1.0.17-1 b/debian/patches/000_debian-changes-1:1.0.17-1
deleted file mode 100644
index 6c6f994..0000000
--- a/debian/patches/000_debian-changes-1:1.0.17-1
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Upstream changes introduced in version 1:1.0.17-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- bsfilter (1:1.0.17-1) unstable; urgency=low
- .
-   * new upstream version.
-   * updated manpage.
- .
- The person named in the Author field signed this changelog entry.
-Author: akira yamada <akira at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- bsfilter-1.0.17.orig/bsfilter/bsfilter
-+++ bsfilter-1.0.17/bsfilter/bsfilter
-@@ -1,4 +1,4 @@
--#! /usr/bin/env ruby
-+#! /usr/bin/ruby1.8
- ## -*-Ruby-*- $Id: bsfilter,v 1.86 2010/11/20 10:07:45 nabeken Exp $
- ## Copyright (C) 2003, 2004, 2005, 2006 NABEYA Kenichi
- ##
diff --git a/debian/patches/010_disable_chasen b/debian/patches/010_disable_chasen
index 634cc1e..342ec6c 100644
--- a/debian/patches/010_disable_chasen
+++ b/debian/patches/010_disable_chasen
@@ -1,8 +1,10 @@
---- a/bsfilter/bsfilter
-+++ b/bsfilter/bsfilter
-@@ -1057,9 +1057,6 @@
+Index: bsfilter/bsfilter/bsfilter
+===================================================================
+--- bsfilter.orig/bsfilter/bsfilter	2013-12-22 18:34:24.271015280 +0100
++++ bsfilter/bsfilter/bsfilter	2013-12-22 18:34:34.000000000 +0100
+@@ -1068,9 +1068,6 @@ EOM
          else
-           @m = MeCab::Tagger.new([$0, "-Ochasen"])
+           @m_dic_enc = Encoding::default_external
          end
 -      when "chasen"
 -        Chasen.getopt("-F", '%H %m\n', "-j")
@@ -10,7 +12,7 @@
        when "kakasi"
          @method = Proc::new {|s| kakasi(s)}
        else
-@@ -1123,31 +1120,6 @@
+@@ -1152,31 +1149,6 @@ EOM
        return array
      end
      
@@ -42,7 +44,7 @@
      def block(str)
        tokens = str.scan(Reg_kanji)
        tokens.concat(str.scan(Reg_katakana))
-@@ -1960,7 +1932,7 @@
+@@ -2013,7 +1985,7 @@ OPTIONS
  		specify the name of database type
  		"sdbm" by default
  
@@ -51,7 +53,7 @@
  		specify algorithm of a tokenizer for Japanese language
  		"bigram" by default
  
-@@ -3144,8 +3116,6 @@
+@@ -3199,8 +3171,6 @@ EOM
      when "block"
      when "mecab"
        require 'MeCab'
@@ -60,9 +62,11 @@
      when "kakasi"
        require 'kakasi'
      else
---- a/test/test.rb
-+++ b/test/test.rb
-@@ -217,14 +217,9 @@
+Index: bsfilter/test/test.rb
+===================================================================
+--- bsfilter.orig/test/test.rb	2013-12-22 18:34:24.271015280 +0100
++++ bsfilter/test/test.rb	2013-12-22 18:34:34.000000000 +0100
+@@ -228,14 +228,9 @@ class TestMultipleInstances < Test::Unit
      @bsfilter2.setup($default_options + ["--jtokenizer", "bigram"])
      @bsfilter2.use_dummyfh
  
@@ -77,7 +81,7 @@
  
      assert_equal(1, @bsfilter0.count_message(/tokenizer ja body ī��/),  "@bsfilter0 2letters")
      assert_equal(0, @bsfilter0.count_message(/tokenizer ja body ������/), "@bsfilter0 3letters")
-@@ -234,9 +229,6 @@
+@@ -245,9 +240,6 @@ class TestMultipleInstances < Test::Unit
  
      assert_equal(1, @bsfilter2.count_message(/tokenizer ja body ī��/), "@bsfilter2 2letters")
      assert_equal(0, @bsfilter2.count_message(/tokenizer ja body ������/), "@bsfilter2 3letters")
@@ -87,7 +91,7 @@
    end
  
    def teardown
-@@ -325,16 +317,6 @@
+@@ -336,16 +328,6 @@ class TestJtokenizer < Test::Unit::TestC
      end
      @bsfilter.use_dummyfh
      @bsfilter.run(@files)
diff --git a/debian/patches/020_disable_bdb1 b/debian/patches/020_disable_bdb1
index 96f1573..6ee8d86 100644
--- a/debian/patches/020_disable_bdb1
+++ b/debian/patches/020_disable_bdb1
@@ -1,6 +1,8 @@
---- a/bsfilter/bsfilter
-+++ b/bsfilter/bsfilter
-@@ -74,7 +74,6 @@
+Index: bsfilter/bsfilter/bsfilter
+===================================================================
+--- bsfilter.orig/bsfilter/bsfilter	2013-12-22 18:34:24.299015096 +0100
++++ bsfilter/bsfilter/bsfilter	2013-12-22 18:34:24.291015147 +0100
+@@ -74,7 +74,6 @@ class Bsfilter
    
    SDBM_ext = ".sdbm"
    GDBM_ext = ".gdbm"
@@ -8,7 +10,7 @@
    BDB_ext = ".bdb"
    QDBM_ext = ".qdbm"
    
-@@ -808,29 +807,6 @@
+@@ -792,29 +791,6 @@ EOM
      end
    end
    
@@ -38,7 +40,7 @@
    class TokenBDB < TokenDBM
      def initialize(options, language, ext)
        @filename = options["homedir"] + language + ext + BDB_ext
-@@ -1545,10 +1521,6 @@
+@@ -1598,10 +1574,6 @@ EOM
          @clean = TokenGDBM::new(@options, lang, Clean_ext)
          @spam = TokenGDBM::new(@options, lang, Spam_ext)
          @prob = TokenGDBM::new(@options, lang, Prob_ext)
@@ -49,7 +51,7 @@
        when "bdb"
          @clean = TokenBDB::new(@options, lang, Clean_ext)
          @spam = TokenBDB::new(@options, lang, Spam_ext)
-@@ -1928,7 +1900,7 @@
+@@ -1981,7 +1953,7 @@ OPTIONS
  		check and/or study the first number of lines
  		default is #{Default_max_line}. 0 means all
  
@@ -58,7 +60,7 @@
  		specify the name of database type
  		"sdbm" by default
  
-@@ -3096,8 +3068,6 @@
+@@ -3151,8 +3123,6 @@ EOM
        require 'sdbm'
      when "gdbm"
        require 'gdbm'
@@ -67,9 +69,11 @@
      when "bdb"
        require 'bdb'
      when "qdbm"
---- a/test/test.rb
-+++ b/test/test.rb
-@@ -63,9 +63,6 @@
+Index: bsfilter/test/test.rb
+===================================================================
+--- bsfilter.orig/test/test.rb	2013-12-22 18:34:24.299015096 +0100
++++ bsfilter/test/test.rb	2013-12-22 18:34:24.291015147 +0100
+@@ -73,9 +73,6 @@ def unlink_all
    unlink_prob_gdbm({:force => true})
    unlink_token_gdbm({:force => true})
  
@@ -79,7 +83,7 @@
    unlink_prob_bdb({:force => true})
    unlink_token_bdb({:force => true})
  
-@@ -114,25 +111,6 @@
+@@ -124,25 +121,6 @@ def unlink_token_gdbm(options = {})
                    "ja.spam.gdbm.lock"], options)
  end
  
@@ -105,7 +109,7 @@
  def unlink_prob_bdb(options = {})
      FileUtils.rm(["C.prob.bdb",
                    "C.prob.bdb.lock",
-@@ -433,25 +411,6 @@
+@@ -444,25 +422,6 @@ class TestDBM < Test::Unit::TestCase
      unlink_prob_gdbm
    end
  
diff --git a/debian/patches/series b/debian/patches/series
index 18ca57e..f787e0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-000_debian-changes-1:1.0.17-1
 010_disable_chasen
 020_disable_bdb1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bsfilter.git

More information about the Pkg-ruby-extras-commits mailing list