[DRE-maint] Ubuntu libhpricot-ruby 0.5-2ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Mon, 17 Sep 2007 21:11:27 -0400
Source: libhpricot-ruby
Binary: libhpricot-ruby1.8 libhpricot-ruby libhpricot-ruby1.9
Architecture: source
Version: 0.5-2ubuntu1
Distribution: gutsy
Urgency: low
Maintainer: Ubuntu MOTU Team <ubuntu-motu at lists.ubuntu.com>
Changed-By: Barry deFreese <bddebian at comcast.net>
Description: 
 libhpricot-ruby - A fast, enjoyable HTML parser
 libhpricot-ruby1.8 - A fast, enjoyable HTML parser
 libhpricot-ruby1.9 - A fast, enjoyable HTML parser
Changes: 
 libhpricot-ruby (0.5-2ubuntu1) gutsy; urgency=low
 .
   * Replace RSTRING(foo)->ptr with RSTRING_PTR(foo)
   * Replace RSTRING(foo)->len with RSTRING_LEN(foo)
   * Update maintainer per spec
   * Should sync new upstream in Hardy
Files: 
 6e4a7b1cffd425dd841c9da5c4258a52 871 libs extra libhpricot-ruby_0.5-2ubuntu1.dsc
 eae1b2231ea19107102c6ad6efbce841 3113 libs extra libhpricot-ruby_0.5-2ubuntu1.diff.gz
Original-Maintainer: Ari Pollak <ari at debian.org>
-------------- next part --------------
diff -pruN 0.5-2/debian/changelog 0.5-2ubuntu1/debian/changelog
--- 0.5-2/debian/changelog	2007-09-18 20:05:07.000000000 +0100
+++ 0.5-2ubuntu1/debian/changelog	2007-09-18 20:05:07.000000000 +0100
@@ -1,3 +1,12 @@
+libhpricot-ruby (0.5-2ubuntu1) gutsy; urgency=low
+
+  * Replace RSTRING(foo)->ptr with RSTRING_PTR(foo)
+  * Replace RSTRING(foo)->len with RSTRING_LEN(foo)
+  * Update maintainer per spec
+  * Should sync new upstream in Hardy
+
+ -- Barry deFreese <bddebian at comcast.net>  Mon, 17 Sep 2007 21:11:27 -0400
+
 libhpricot-ruby (0.5-2) unstable; urgency=low
 
   * Upload to unstable
diff -pruN 0.5-2/debian/control 0.5-2ubuntu1/debian/control
--- 0.5-2/debian/control	2007-09-18 20:05:07.000000000 +0100
+++ 0.5-2ubuntu1/debian/control	2007-09-18 20:05:07.000000000 +0100
@@ -1,7 +1,8 @@
 Source: libhpricot-ruby
 Section: libs
 Priority: extra
-Maintainer: Ari Pollak <ari at debian.org>
+Maintainer: Ubuntu MOTU Team <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Ari Pollak <ari at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.8), 
  ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
diff -pruN 0.5-2/ext/hpricot_scan/hpricot_scan.c 0.5-2ubuntu1/ext/hpricot_scan/hpricot_scan.c
--- 0.5-2/ext/hpricot_scan/hpricot_scan.c	2007-01-31 18:36:22.000000000 +0000
+++ 0.5-2ubuntu1/ext/hpricot_scan/hpricot_scan.c	2007-09-18 20:05:07.000000000 +0100
@@ -140,7 +140,7 @@ VALUE hpricot_scan(VALUE self, VALUE por
       /* 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 @@ VALUE hpricot_scan(VALUE self, VALUE por
     }
 
     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 @@ case 213:
       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 -pruN 0.5-2/ext/hpricot_scan/hpricot_scan.rl 0.5-2ubuntu1/ext/hpricot_scan/hpricot_scan.rl
--- 0.5-2/ext/hpricot_scan/hpricot_scan.rl	2007-01-30 21:11:19.000000000 +0000
+++ 0.5-2ubuntu1/ext/hpricot_scan/hpricot_scan.rl	2007-09-18 20:05:07.000000000 +0100
@@ -236,7 +236,7 @@ VALUE hpricot_scan(VALUE self, VALUE por
       /* 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 @@ VALUE hpricot_scan(VALUE self, VALUE por
     }
 
     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 @@ VALUE hpricot_scan(VALUE self, VALUE por
       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
       {