[DRE-commits] r5780 - in trunk/tokyocabinet-ruby: . debian debian/patches debian/source
Laurent Arnoud
spk-guest at alioth.debian.org
Wed Aug 18 20:38:44 UTC 2010
Author: spk-guest
Date: 2010-08-18 20:38:42 +0000 (Wed, 18 Aug 2010)
New Revision: 5780
Added:
trunk/tokyocabinet-ruby/debian/
trunk/tokyocabinet-ruby/debian/changelog
trunk/tokyocabinet-ruby/debian/compat
trunk/tokyocabinet-ruby/debian/control
trunk/tokyocabinet-ruby/debian/copyright
trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.examples
trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.rdoc
trunk/tokyocabinet-ruby/debian/patches/
trunk/tokyocabinet-ruby/debian/patches/change_require_statements_using_relative_paths.patch
trunk/tokyocabinet-ruby/debian/patches/fix_checking_block_parameter.patch
trunk/tokyocabinet-ruby/debian/patches/series
trunk/tokyocabinet-ruby/debian/rules
trunk/tokyocabinet-ruby/debian/source/
trunk/tokyocabinet-ruby/debian/source/format
trunk/tokyocabinet-ruby/debian/watch
Log:
[svn-inject] Application des modifications Debian (1.30-2) pour le trunk
Property changes on: trunk/tokyocabinet-ruby/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/tokyocabinet-ruby/debian/changelog
===================================================================
--- trunk/tokyocabinet-ruby/debian/changelog (rev 0)
+++ trunk/tokyocabinet-ruby/debian/changelog 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,37 @@
+tokyocabinet-ruby (1.30-2) unstable; urgency=low
+
+ * Added support for Ruby 1.9.2 (Closes: #593024)
+ * Bump Standards-Version to 3.9.1 (no changes).
+
+ -- Laurent Arnoud <laurent at spkdev.net> Tue, 17 Aug 2010 03:01:22 +0200
+
+tokyocabinet-ruby (1.30-1) unstable; urgency=low
+
+ * New upstream release
+ * Generate rdoc for libtokyocabinet-ruby-doc.
+ * Bump Standards-Version to 3.8.4 (no changes).
+ * Switched to source format 3.0 (quilt)
+ * debian/control: Change my email address.
+ * Add Vcs fields.
+
+ -- Laurent Arnoud <laurent at spkdev.net> Wed, 24 Mar 2010 20:55:30 +0100
+
+tokyocabinet-ruby (1.29-2) unstable; urgency=low
+
+ * Drop 1.9 package (Closes: #565838)
+ * Enable the test suite
+
+ -- Laurent Arnoud <laurent.arnoud at gmail.com> Tue, 19 Jan 2010 22:13:40 +0100
+
+tokyocabinet-ruby (1.29-1) unstable; urgency=low
+
+ * New upstream release
+ * Add ruby 1.9.1 version
+
+ -- Laurent Arnoud <laurent.arnoud at gmail.com> Mon, 09 Nov 2009 21:40:34 +0100
+
+tokyocabinet-ruby (1.21-1) unstable; urgency=low
+
+ * Initial release (Closes: #551930)
+
+ -- Laurent Arnoud <laurent.arnoud at gmail.com> Tue, 20 Oct 2009 23:55:13 +0200
Added: trunk/tokyocabinet-ruby/debian/compat
===================================================================
--- trunk/tokyocabinet-ruby/debian/compat (rev 0)
+++ trunk/tokyocabinet-ruby/debian/compat 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1 @@
+7
Added: trunk/tokyocabinet-ruby/debian/control
===================================================================
--- trunk/tokyocabinet-ruby/debian/control (rev 0)
+++ trunk/tokyocabinet-ruby/debian/control 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,53 @@
+Source: tokyocabinet-ruby
+Section: libs
+Priority: extra
+Maintainer: Laurent Arnoud <laurent at spkdev.net>
+Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools,
+ libtokyocabinet-dev (>= 1.4.37), ruby1.8, ruby1.8-dev, ruby1.9.1,
+ ruby1.9.1-dev, zlib1g-dev, libbz2-dev
+Build-Depends-Indep: graphviz
+Standards-Version: 3.9.1
+Homepage: http://1978th.net/tokyocabinet/
+Vcs-Git: git://git.debian.org/collab-maint/tokyocabinet-ruby.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/tokyocabinet-ruby.git
+
+Package: libtokyocabinet-ruby-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Documentation for Ruby Binding of Tokyo Cabinet Database
+ Tokyo Cabinet is an efficient database library like GDBM and NDBM.
+ It features hash database and B+ tree database and is developed as the
+ successor of QDBM, for the purpose of the following three points: higher
+ processing speed, smaller size of a database file, and simpler API.
+ .
+ Documentation for all of the API's and utilities provided by Tokyo Cabinet
+ Ruby Biding.
+
+Package: libtokyocabinet-ruby1.8
+Section: ruby
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtokyocabinet-ruby-doc
+Description: Ruby Binding of Tokyo Cabinet Database (ruby 1.8)
+ Tokyo Cabinet is an efficient database library like GDBM and NDBM.
+ It features hash database and B+ tree database and is developed as the
+ successor of QDBM, for the purpose of the following three points: higher
+ processing speed, smaller size of a database file, and simpler API.
+ .
+ This is the Ruby Binding package for ruby1.8 programs that use the
+ Tokyo Cabinet database library.
+
+Package: libtokyocabinet-ruby1.9.1
+Section: ruby
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtokyocabinet-ruby-doc
+Description: Ruby Binding of Tokyo Cabinet Database (ruby 1.9.1)
+ Tokyo Cabinet is an efficient database library like GDBM and NDBM.
+ It features hash database and B+ tree database and is developed as the
+ successor of QDBM, for the purpose of the following three points: higher
+ processing speed, smaller size of a database file, and simpler API.
+ .
+ This is the Ruby Binding package for ruby1.9.1 programs that use the
+ Tokyo Cabinet database library.
Added: trunk/tokyocabinet-ruby/debian/copyright
===================================================================
--- trunk/tokyocabinet-ruby/debian/copyright (rev 0)
+++ trunk/tokyocabinet-ruby/debian/copyright 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,39 @@
+This package was debianized by:
+
+ Laurent Arnoud <laurent.arnoud at gmail.com> on Sun, 05 Apr 2009 16:33:27 +0200
+
+It was downloaded from:
+
+ http://1978th.net/tokyocabinet/
+
+Upstream Author:
+
+ Mikio Hirabayashi <mikio at users.sourceforge.net>
+
+Copyright:
+
+ <Copyright (C) 2006-2009 Mikio Hirabayashi>
+
+License:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+ Copyright (C) 2009 Laurent Arnoud <laurent.arnoud at gmail.com>
+
+and is licensed under the GPL version 3, see above.
Added: trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.examples
===================================================================
--- trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.examples (rev 0)
+++ trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.examples 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1 @@
+example
Added: trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.rdoc
===================================================================
--- trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.rdoc (rev 0)
+++ trunk/tokyocabinet-ruby/debian/libtokyocabinet-ruby-doc.rdoc 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1 @@
+.
Added: trunk/tokyocabinet-ruby/debian/patches/change_require_statements_using_relative_paths.patch
===================================================================
--- trunk/tokyocabinet-ruby/debian/patches/change_require_statements_using_relative_paths.patch (rev 0)
+++ trunk/tokyocabinet-ruby/debian/patches/change_require_statements_using_relative_paths.patch 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,70 @@
+Description: Change require statements using relative paths for Ruby 1.9.2
+ * memsize.rb, tcatest.rb, tcbtest.rb, tcftest.rb, tchtest.rb, tcttest.rb:
+ replace «require 'tokyocabinet'» by «require './tokyocabinet'»
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593098
+Author: Laurent Arnoud <laurent at spkdev.net>
+--- a/memsize.rb
++++ b/memsize.rb
+@@ -1,6 +1,6 @@
+ #! /usr/bin/ruby
+
+-require 'tokyocabinet'
++require './tokyocabinet'
+ include TokyoCabinet
+
+ def memoryusage()
+--- a/tcatest.rb
++++ b/tcatest.rb
+@@ -16,7 +16,7 @@
+ #-------------------------------------------------------------------------------------------------
+
+
+-require 'tokyocabinet'
++require './tokyocabinet'
+ include TokyoCabinet
+
+
+--- a/tcbtest.rb
++++ b/tcbtest.rb
+@@ -16,7 +16,7 @@
+ #-------------------------------------------------------------------------------------------------
+
+
+-require 'tokyocabinet'
++require './tokyocabinet'
+ include TokyoCabinet
+
+
+--- a/tcftest.rb
++++ b/tcftest.rb
+@@ -16,7 +16,7 @@
+ #-------------------------------------------------------------------------------------------------
+
+
+-require 'tokyocabinet'
++require './tokyocabinet'
+ include TokyoCabinet
+
+
+--- a/tchtest.rb
++++ b/tchtest.rb
+@@ -16,7 +16,7 @@
+ #-------------------------------------------------------------------------------------------------
+
+
+-require 'tokyocabinet'
++require './tokyocabinet'
+ include TokyoCabinet
+
+
+--- a/tcttest.rb
++++ b/tcttest.rb
+@@ -16,7 +16,7 @@
+ #-------------------------------------------------------------------------------------------------
+
+
+-require 'tokyocabinet'
++require './tokyocabinet'
+ include TokyoCabinet
+
+
Added: trunk/tokyocabinet-ruby/debian/patches/fix_checking_block_parameter.patch
===================================================================
--- trunk/tokyocabinet-ruby/debian/patches/fix_checking_block_parameter.patch (rev 0)
+++ trunk/tokyocabinet-ruby/debian/patches/fix_checking_block_parameter.patch 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,151 @@
+Description: Fix checking block parameter for Ruby 1.9.2
+ * tokyocabinet.c: replace «rb_block_given_p() != Qtrue» by
+ «!rb_block_given_p()» works with Ruby 1.8 and 1.9.2
+ see http://gist.github.com/191146
+Author: Laurent Arnoud <laurent at spkdev.net>
+--- a/tokyocabinet.c
++++ b/tokyocabinet.c
+@@ -951,7 +951,7 @@ static VALUE hdb_each(VALUE vself){
+ VALUE vhdb, vrv;
+ TCHDB *hdb;
+ TCXSTR *kxstr, *vxstr;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vhdb = rb_iv_get(vself, HDBVNDATA);
+ Data_Get_Struct(vhdb, TCHDB, hdb);
+ vrv = Qnil;
+@@ -972,7 +972,7 @@ static VALUE hdb_each_key(VALUE vself){
+ VALUE vhdb, vrv;
+ TCHDB *hdb;
+ TCXSTR *kxstr, *vxstr;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vhdb = rb_iv_get(vself, HDBVNDATA);
+ Data_Get_Struct(vhdb, TCHDB, hdb);
+ vrv = Qnil;
+@@ -992,7 +992,7 @@ static VALUE hdb_each_value(VALUE vself)
+ VALUE vhdb, vrv;
+ TCHDB *hdb;
+ TCXSTR *kxstr, *vxstr;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vhdb = rb_iv_get(vself, HDBVNDATA);
+ Data_Get_Struct(vhdb, TCHDB, hdb);
+ vrv = Qnil;
+@@ -1697,7 +1697,7 @@ static VALUE bdb_each(VALUE vself){
+ TCBDB *bdb;
+ BDBCUR *cur;
+ TCXSTR *kxstr, *vxstr;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vbdb = rb_iv_get(vself, BDBVNDATA);
+ Data_Get_Struct(vbdb, TCBDB, bdb);
+ vrv = Qnil;
+@@ -1723,7 +1723,7 @@ static VALUE bdb_each_key(VALUE vself){
+ BDBCUR *cur;
+ const char *kbuf;
+ int ksiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vbdb = rb_iv_get(vself, BDBVNDATA);
+ Data_Get_Struct(vbdb, TCBDB, bdb);
+ vrv = Qnil;
+@@ -1744,7 +1744,7 @@ static VALUE bdb_each_value(VALUE vself)
+ BDBCUR *cur;
+ const char *vbuf;
+ int vsiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vbdb = rb_iv_get(vself, BDBVNDATA);
+ Data_Get_Struct(vbdb, TCBDB, bdb);
+ vrv = Qnil;
+@@ -2413,7 +2413,7 @@ static VALUE fdb_each(VALUE vself){
+ char *vbuf, kbuf[NUMBUFSIZ];
+ int vsiz, ksiz;
+ uint64_t id;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vfdb = rb_iv_get(vself, FDBVNDATA);
+ Data_Get_Struct(vfdb, TCFDB, fdb);
+ vrv = Qnil;
+@@ -2436,7 +2436,7 @@ static VALUE fdb_each_key(VALUE vself){
+ char kbuf[NUMBUFSIZ];
+ int ksiz;
+ uint64_t id;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vfdb = rb_iv_get(vself, FDBVNDATA);
+ Data_Get_Struct(vfdb, TCFDB, fdb);
+ vrv = Qnil;
+@@ -2455,7 +2455,7 @@ static VALUE fdb_each_value(VALUE vself)
+ char *vbuf;
+ int vsiz;
+ uint64_t id;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vfdb = rb_iv_get(vself, FDBVNDATA);
+ Data_Get_Struct(vfdb, TCFDB, fdb);
+ vrv = Qnil;
+@@ -3024,7 +3024,7 @@ static VALUE tdb_each(VALUE vself){
+ TCMAP *cols;
+ char *kbuf;
+ int ksiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vtdb = rb_iv_get(vself, TDBVNDATA);
+ Data_Get_Struct(vtdb, TCTDB, tdb);
+ vrv = Qnil;
+@@ -3045,7 +3045,7 @@ static VALUE tdb_each_key(VALUE vself){
+ TCTDB *tdb;
+ char *kbuf;
+ int ksiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vtdb = rb_iv_get(vself, TDBVNDATA);
+ Data_Get_Struct(vtdb, TCTDB, tdb);
+ vrv = Qnil;
+@@ -3064,7 +3064,7 @@ static VALUE tdb_each_value(VALUE vself)
+ TCMAP *cols;
+ char *kbuf;
+ int ksiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vtdb = rb_iv_get(vself, TDBVNDATA);
+ Data_Get_Struct(vtdb, TCTDB, tdb);
+ vrv = Qnil;
+@@ -3274,7 +3274,7 @@ static VALUE tdbqry_searchout(VALUE vsel
+ static VALUE tdbqry_proc(VALUE vself, VALUE vproc){
+ VALUE vqry;
+ TDBQRY *qry;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vqry = rb_iv_get(vself, TDBQRYVNDATA);
+ Data_Get_Struct(vqry, TDBQRY, qry);
+ return tctdbqryproc(qry, (TDBQRYPROC)tdbqry_procrec, NULL) ? Qtrue : Qfalse;
+@@ -3793,7 +3793,7 @@ static VALUE adb_each(VALUE vself){
+ TCADB *adb;
+ char *tkbuf, *tvbuf;
+ int tksiz, tvsiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vadb = rb_iv_get(vself, ADBVNDATA);
+ Data_Get_Struct(vadb, TCADB, adb);
+ vrv = Qnil;
+@@ -3815,7 +3815,7 @@ static VALUE adb_each_key(VALUE vself){
+ TCADB *adb;
+ char *tkbuf;
+ int tksiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vadb = rb_iv_get(vself, ADBVNDATA);
+ Data_Get_Struct(vadb, TCADB, adb);
+ vrv = Qnil;
+@@ -3833,7 +3833,7 @@ static VALUE adb_each_value(VALUE vself)
+ TCADB *adb;
+ char *tkbuf, *tvbuf;
+ int tksiz, tvsiz;
+- if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
++ if(!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+ vadb = rb_iv_get(vself, ADBVNDATA);
+ Data_Get_Struct(vadb, TCADB, adb);
+ vrv = Qnil;
Added: trunk/tokyocabinet-ruby/debian/patches/series
===================================================================
--- trunk/tokyocabinet-ruby/debian/patches/series (rev 0)
+++ trunk/tokyocabinet-ruby/debian/patches/series 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,2 @@
+change_require_statements_using_relative_paths.patch
+fix_checking_block_parameter.patch
Added: trunk/tokyocabinet-ruby/debian/rules
===================================================================
--- trunk/tokyocabinet-ruby/debian/rules (rev 0)
+++ trunk/tokyocabinet-ruby/debian/rules 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
+
+install/libtokyocabinet-ruby1.8::
+ (ruby1.8 test.rb)
+
+install/libtokyocabinet-ruby1.9.1::
+ (ruby1.9.1 test.rb)
Property changes on: trunk/tokyocabinet-ruby/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/tokyocabinet-ruby/debian/source/format
===================================================================
--- trunk/tokyocabinet-ruby/debian/source/format (rev 0)
+++ trunk/tokyocabinet-ruby/debian/source/format 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/tokyocabinet-ruby/debian/watch
===================================================================
--- trunk/tokyocabinet-ruby/debian/watch (rev 0)
+++ trunk/tokyocabinet-ruby/debian/watch 2010-08-18 20:38:42 UTC (rev 5780)
@@ -0,0 +1,2 @@
+version=3
+http://1978th.net/tokyocabinet/rubypkg/tokyocabinet-ruby-(.*)\.tar\.gz
More information about the Pkg-ruby-extras-commits
mailing list