[DRE-commits] r1729 - in packages/libhpricot-ruby/trunk/debian: . patches

[ari at alioth.debian.org]

Author: ari
Date: 2007-06-21 21:26:58 +0000 (Thu, 21 Jun 2007)
New Revision: 1729

Added:
   packages/libhpricot-ruby/trunk/debian/patches/
   packages/libhpricot-ruby/trunk/debian/patches/00_ftbfs.patch
Modified:
   packages/libhpricot-ruby/trunk/debian/changelog
Log:
releasing version 0.6-1

Modified: packages/libhpricot-ruby/trunk/debian/changelog
===================================================================
--- packages/libhpricot-ruby/trunk/debian/changelog	2007-06-20 18:41:55 UTC (rev 1728)
+++ packages/libhpricot-ruby/trunk/debian/changelog	2007-06-21 21:26:58 UTC (rev 1729)
@@ -1,3 +1,10 @@
+libhpricot-ruby (0.6-1) unstable; urgency=low
+
+  * New upstream version
+  * Fix FTBFS with new ruby (Closes: #427463)
+
+ -- Ari Pollak <ari at debian.org>  Thu, 21 Jun 2007 11:40:50 -0400
+
 libhpricot-ruby (0.5-2) unstable; urgency=low
 
   * Upload to unstable

Added: packages/libhpricot-ruby/trunk/debian/patches/00_ftbfs.patch
===================================================================
--- packages/libhpricot-ruby/trunk/debian/patches/00_ftbfs.patch	                        (rev 0)
+++ packages/libhpricot-ruby/trunk/debian/patches/00_ftbfs.patch	2007-06-21 21:26:58 UTC (rev 1729)
@@ -0,0 +1,64 @@
+diff -ruN libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.c ../libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.c
+--- libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.c	2007-01-31 19:36:22.000000000 +0100
++++ ../libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.c	2007-06-04 10:20:14.952421398 +0200
+@@ -140,7 +140,7 @@
+       /* We've used up the entire buffer storing an already-parsed token
+        * prefix that must be preserved.  Likely caused by super-long attributes.
+        * See ticket #13. */
+-      rb_raise(rb_eHpricotParseError, "ran out of buffer space on element <%s>, starting on line %d.", RSTRING(tag)->ptr, curline);
++      rb_raise(rb_eHpricotParseError, "ran out of buffer space on element <%s>, starting on line %d.", RSTRING_PTR(tag), curline);
+     }
+ 
+     if ( rb_respond_to( port, s_read ) )
+@@ -153,8 +153,8 @@
+     }
+ 
+     StringValue(str);
+-    memcpy( p, RSTRING(str)->ptr, RSTRING(str)->len );
+-    len = RSTRING(str)->len;
++    memcpy( p, RSTRING_PTR(str), RSTRING_LEN(str));
++    len = RSTRING_LEN(str);
+     nread += len;
+ 
+     /* If this is the last buffer, tack on an EOF. */
+@@ -5648,7 +5648,7 @@
+       free(buf);
+       if ( !NIL_P(tag) )
+       {
+-        rb_raise(rb_eHpricotParseError, "parse error on element <%s>, starting on line %d.\n" NO_WAY_SERIOUSLY, RSTRING(tag)->ptr, curline);
++        rb_raise(rb_eHpricotParseError, "parse error on element <%s>, starting on line %d.\n" NO_WAY_SERIOUSLY, RSTRING_PTR(tag), curline);
+       }
+       else
+       {
+diff -ruN libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.rl ../libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.rl
+--- libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.rl	2007-01-30 22:11:19.000000000 +0100
++++ ../libhpricot-ruby-0.5/ext/hpricot_scan/hpricot_scan.rl	2007-06-04 10:19:41.706526825 +0200
+@@ -236,7 +236,7 @@
+       /* We've used up the entire buffer storing an already-parsed token
+        * prefix that must be preserved.  Likely caused by super-long attributes.
+        * See ticket #13. */
+-      rb_raise(rb_eHpricotParseError, "ran out of buffer space on element <%s>, starting on line %d.", RSTRING(tag)->ptr, curline);
++      rb_raise(rb_eHpricotParseError, "ran out of buffer space on element <%s>, starting on line %d.", RSTRING_PTR(tag), curline);
+     }
+ 
+     if ( rb_respond_to( port, s_read ) )
+@@ -249,8 +249,8 @@
+     }
+ 
+     StringValue(str);
+-    memcpy( p, RSTRING(str)->ptr, RSTRING(str)->len );
+-    len = RSTRING(str)->len;
++    memcpy( p, RSTRING_PTR(str), RSTRING_LEN(str));
++    len = RSTRING_LEN(str);
+     nread += len;
+ 
+     /* If this is the last buffer, tack on an EOF. */
+@@ -266,7 +266,7 @@
+       free(buf);
+       if ( !NIL_P(tag) )
+       {
+-        rb_raise(rb_eHpricotParseError, "parse error on element <%s>, starting on line %d.\n" NO_WAY_SERIOUSLY, RSTRING(tag)->ptr, curline);
++        rb_raise(rb_eHpricotParseError, "parse error on element <%s>, starting on line %d.\n" NO_WAY_SERIOUSLY, RSTRING_PTR(tag), curline);
+       }
+       else
+       {