[DRE-commits] r4308 - in trunk/libxml-parser-ruby/debian: . patches
Ryan Niebur
ryan at alioth.debian.org
Sun Nov 8 05:29:17 UTC 2009
Author: ryan
Date: 2009-11-08 05:29:16 +0000 (Sun, 08 Nov 2009)
New Revision: 4308
Added:
trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch
Modified:
trunk/libxml-parser-ruby/debian/changelog
trunk/libxml-parser-ruby/debian/control
trunk/libxml-parser-ruby/debian/rules
trunk/libxml-parser-ruby/debian/watch
Log:
add libxml-parser-ruby1.9 package
Modified: trunk/libxml-parser-ruby/debian/changelog
===================================================================
--- trunk/libxml-parser-ruby/debian/changelog 2009-11-06 22:49:04 UTC (rev 4307)
+++ trunk/libxml-parser-ruby/debian/changelog 2009-11-08 05:29:16 UTC (rev 4308)
@@ -6,8 +6,11 @@
[ Gunnar Wolf ]
* Changed section to Ruby as per ftp-masters' request
- -- Gunnar Wolf <gwolf at debian.org> Tue, 21 Apr 2009 15:54:28 -0500
+ [ Ryan Niebur ]
+ * add libxml-parser-ruby1.9 package
+ -- Ryan Niebur <ryan at debian.org> Sat, 07 Nov 2009 21:28:56 -0800
+
libxml-parser-ruby (0.6.8-4) unstable; urgency=low
[ Vincent Fourmond ]
Modified: trunk/libxml-parser-ruby/debian/control
===================================================================
--- trunk/libxml-parser-ruby/debian/control 2009-11-06 22:49:04 UTC (rev 4307)
+++ trunk/libxml-parser-ruby/debian/control 2009-11-08 05:29:16 UTC (rev 4308)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Filipe Lautert <filipe at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 5), cdbs, ruby-pkg-tools, libexpat1-dev (>= 1.95.1), ruby1.8, ruby1.8-dev
+Build-Depends: debhelper (>> 5), cdbs, ruby-pkg-tools, libexpat1-dev (>= 1.95.1), ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libxml-parser-ruby/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libxml-parser-ruby/
@@ -15,3 +15,10 @@
Description: Interface of expat for the scripting language Ruby 1.8
This is the module to access to James Clark's XML Parser Toolkit "expat"
<URL:http://www.jclark.com/xml/expat.html> from Ruby 1.8.
+
+Package: libxml-parser-ruby1.9
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Interface of expat for the scripting language Ruby 1.9
+ This is the module to access to James Clark's XML Parser Toolkit "expat"
+ <URL:http://www.jclark.com/xml/expat.html> from Ruby 1.8.
Added: trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch
===================================================================
--- trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch (rev 0)
+++ trunk/libxml-parser-ruby/debian/patches/003-port-to-ruby1.9.patch 2009-11-08 05:29:16 UTC (rev 4308)
@@ -0,0 +1,128 @@
+--- xmlparser.c-or 2004-04-20 09:04:24.000000000 -0700
++++ xmlparser.c 2009-11-07 21:03:23.000000000 -0800
+@@ -1045,21 +1045,21 @@
+ {
+ VALUE v;
+ int len;
+- int slen = RSTRING(rb_ivar_get((VALUE)data,
+- id_map))->ptr[*(unsigned char*)s];
++ int slen = RSTRING_PTR(rb_ivar_get((VALUE)data,
++ id_map))[*(unsigned char*)s];
+
+ v = rb_funcall((VALUE)data, id_convert, 1, rb_str_new((char*)s, -slen));
+ switch (TYPE(v)) {
+ case T_FIXNUM:
+ return FIX2INT(v);
+ case T_STRING:
+- len = RSTRING(v)->len;
++ len = RSTRING_LEN(v);
+ if (len == 1) {
+- return (unsigned char)*(RSTRING(v)->ptr);
++ return (unsigned char)*(RSTRING_PTR(v));
+ }
+ else if (len >= 2) {
+- return (unsigned char)*(RSTRING(v)->ptr) |
+- (unsigned char)*(RSTRING(v)->ptr + 1) << 8;
++ return (unsigned char)*(RSTRING_PTR(v)) |
++ (unsigned char)*(RSTRING_PTR(v) + 1) << 8;
+ }
+ }
+ return 0;
+@@ -1088,7 +1088,7 @@
+
+ for (i = 0; i < 256; i++) {
+ VALUE m = rb_funcall(ret, mid, 1, INT2FIX(i));
+- RSTRING(cmap)->ptr[i] = info->map[i] = FIX2INT(m);
++ RSTRING_PTR(cmap)[i] = info->map[i] = FIX2INT(m);
+ }
+ /* protect object form GC */
+ rb_ivar_set(recv, rb_intern("_encoding"), ret);
+@@ -1308,7 +1308,7 @@
+
+ for (i = 0; i < 256; i++) {
+ VALUE m = rb_funcall(ret, mid, 1, INT2FIX(i));
+- RSTRING(cmap)->ptr[i] = info->map[i] = FIX2INT(m);
++ RSTRING_PTR(cmap)[i] = info->map[i] = FIX2INT(m);
+ }
+ /* protect object form GC */
+ rb_ivar_set((VALUE)recv, rb_intern("_encoding"), ret);
+@@ -1359,7 +1359,7 @@
+ /* new(encoding) */
+ if (TYPE(arg1) != T_NIL) {
+ Check_Type(arg1, T_STRING); /* encoding */
+- encoding = RSTRING(arg1)->ptr;
++ encoding = RSTRING_PTR(arg1);
+ }
+ }
+ else if (count == 2) {
+@@ -1369,10 +1369,10 @@
+ if (TYPE(arg1) != T_DATA) {
+ if (TYPE(arg1) != T_NIL) {
+ Check_Type(arg1, T_STRING); /* encoding */
+- encoding = RSTRING(arg1)->ptr;
++ encoding = RSTRING_PTR(arg1);
+ }
+ Check_Type(arg2, T_STRING); /* nschar */
+- nssep = RSTRING(arg2)->ptr;
++ nssep = RSTRING_PTR(arg2);
+ }
+ else {
+ #endif
+@@ -1380,7 +1380,7 @@
+ GET_PARSER(arg1, rootparser);
+ if (!NIL_P(arg2)) {
+ Check_Type(arg2, T_STRING); /* context */
+- context = RSTRING(arg2)->ptr;
++ context = RSTRING_PTR(arg2);
+ }
+ parent = arg1;
+ #ifdef NEW_EXPAT
+@@ -1393,10 +1393,10 @@
+ GET_PARSER(arg1, rootparser);
+ if (!NIL_P(arg2)) {
+ Check_Type(arg2, T_STRING); /* context */
+- context = RSTRING(arg2)->ptr;
++ context = RSTRING_PTR(arg2);
+ }
+ Check_Type(arg3, T_STRING); /* encoding */
+- encoding = RSTRING(arg3)->ptr;
++ encoding = RSTRING_PTR(arg3);
+ parent = arg1;
+ }
+
+@@ -1491,7 +1491,7 @@
+ GET_PARSER(obj, parser);
+ if (count > 0 && TYPE(vencoding) != T_NIL) {
+ Check_Type(vencoding, T_STRING);
+- encoding = RSTRING(vencoding)->ptr;
++ encoding = RSTRING_PTR(vencoding);
+ }
+ XML_ParserReset(parser->parser, encoding);
+ /* setting up internal data */
+@@ -1740,7 +1740,7 @@
+ taintParser(parser);
+ rb_ivar_set(obj, linebuf, buf); /* protect buf from GC (reasonable?)*/
+ ret = XML_Parse(parser->parser,
+- RSTRING(buf)->ptr, RSTRING(buf)->len, 0);
++ RSTRING_PTR(buf), RSTRING_LEN(buf), 0);
+ }
+ else {
+ ret = XML_Parse(parser->parser, NULL, 0, 1);
+@@ -1759,7 +1759,7 @@
+ if (OBJ_TAINTED(str))
+ taintParser(parser);
+ ret = XML_Parse(parser->parser,
+- RSTRING(str)->ptr, RSTRING(str)->len, final);
++ RSTRING_PTR(str), RSTRING_LEN(str), final);
+ }
+ else
+ ret = XML_Parse(parser->parser, NULL, 0, final);
+@@ -1852,7 +1852,7 @@
+ GET_PARSER(obj, parser);
+ if (OBJ_TAINTED(base))
+ taintParser(parser);
+- ret = XML_SetBase(parser->parser, RSTRING(base)->ptr);
++ ret = XML_SetBase(parser->parser, RSTRING_PTR(base));
+
+ return INT2FIX(ret);
+ }
Modified: trunk/libxml-parser-ruby/debian/rules
===================================================================
--- trunk/libxml-parser-ruby/debian/rules 2009-11-06 22:49:04 UTC (rev 4307)
+++ trunk/libxml-parser-ruby/debian/rules 2009-11-08 05:29:16 UTC (rev 4308)
@@ -7,4 +7,4 @@
include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
DEB_RUBY_SETUP_ARGS = --with-perl-enc-map=/usr/lib/perl5/XML/Parser/Encodings
-DEB_RUBY_INSTALL_ARGS = sitedir=$(CURDIR)/debian/libxml-parser-ruby1.8/usr/lib/ruby
+
Modified: trunk/libxml-parser-ruby/debian/watch
===================================================================
--- trunk/libxml-parser-ruby/debian/watch 2009-11-06 22:49:04 UTC (rev 4307)
+++ trunk/libxml-parser-ruby/debian/watch 2009-11-08 05:29:16 UTC (rev 4308)
@@ -1,4 +1,3 @@
version=3
http://www.yoshidam.net/Ruby.html xmlparser-([\d.]+)\.tar\.gz
-version=3
-http://www.yoshidam.net/Ruby.html xmlparser-(.*).tar.gz
\ No newline at end of file
+
More information about the Pkg-ruby-extras-commits
mailing list