[DRE-commits] r3245 - in packages/libwww-mechanize-ruby/trunk/debian: . patches
ari at alioth.debian.org
ari at alioth.debian.org
Fri Feb 27 05:19:24 UTC 2009
Author: ari
Date: 2009-02-27 05:19:24 +0000 (Fri, 27 Feb 2009)
New Revision: 3245
Added:
packages/libwww-mechanize-ruby/trunk/debian/patches/00_hpricot.patch
Modified:
packages/libwww-mechanize-ruby/trunk/debian/changelog
packages/libwww-mechanize-ruby/trunk/debian/copyright
Log:
releasing version 0.9.1-2
Modified: packages/libwww-mechanize-ruby/trunk/debian/changelog
===================================================================
--- packages/libwww-mechanize-ruby/trunk/debian/changelog 2009-02-26 22:38:43 UTC (rev 3244)
+++ packages/libwww-mechanize-ruby/trunk/debian/changelog 2009-02-27 05:19:24 UTC (rev 3245)
@@ -1,3 +1,11 @@
+libwww-mechanize-ruby (0.9.1-2) unstable; urgency=low
+
+ * debian/patches/00_hpricot.patch
+ - Switch back to hpricot temporarily until nokogiri is packaged
+ (Closes: #517343)
+
+ -- Ari Pollak <ari at debian.org> Thu, 26 Feb 2009 23:52:27 -0500
+
libwww-mechanize-ruby (0.9.1-1) unstable; urgency=low
* New upstream release
Modified: packages/libwww-mechanize-ruby/trunk/debian/copyright
===================================================================
--- packages/libwww-mechanize-ruby/trunk/debian/copyright 2009-02-26 22:38:43 UTC (rev 3244)
+++ packages/libwww-mechanize-ruby/trunk/debian/copyright 2009-02-27 05:19:24 UTC (rev 3245)
@@ -12,68 +12,7 @@
WWW::Mechanize is licensed under the GNU GPLv2, which can be found on Debian
systems at '/usr/share/common-licenses/GPL-2'.
-Also included is a copy of some of the net-overrides directory from Ruby 1.9,
-which is dual-licensed under the Ruby license and GNU GPL. The GPL
-may be found on Debian systems at '/usr/share/common-licenses/GPL-2'.
-The text of the Ruby license is as follows:
--
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING file), or the conditions below:
- 1. You may make and give away verbatim copies of the source form of the
- software without restriction, provided that you duplicate all of the
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
- b) use the modified software only within your corporation or
- organization.
-
- c) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or executable
- form, provided that you do at least ONE of the following:
-
- a) distribute the executables and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
-
- b) accompany the distribution with the machine-readable source of
- the software.
-
- c) give non-standard executables non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 4. You may modify and include the part of the software into any other
- software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under this terms.
- They are gc.c(partly), utils.c(partly), regex.[ch], fnmatch.[ch],
- glob.c, st.[ch] and some files under the ./missing directory. See
- each file for the copying condition.
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
---
-
-The Debian packaging is (C) 2006, Ari Pollak <ari at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is (C) 2006-2009, Ari Pollak <ari at debian.org> and
+is licensed under the GPL v2 or higher, see '/usr/share/common-licenses/GPL-2'.
Added: packages/libwww-mechanize-ruby/trunk/debian/patches/00_hpricot.patch
===================================================================
--- packages/libwww-mechanize-ruby/trunk/debian/patches/00_hpricot.patch (rev 0)
+++ packages/libwww-mechanize-ruby/trunk/debian/patches/00_hpricot.patch 2009-02-27 05:19:24 UTC (rev 3245)
@@ -0,0 +1,65 @@
+diff -Nur -x '*.orig' -x '*~' libwww-mechanize-ruby-0.9.1/lib/www/mechanize/page.rb libwww-mechanize-ruby-0.9.1.new/lib/www/mechanize/page.rb
+--- libwww-mechanize-ruby-0.9.1/lib/www/mechanize/page.rb 2009-01-29 23:03:22.000000000 -0500
++++ libwww-mechanize-ruby-0.9.1.new/lib/www/mechanize/page.rb 2009-02-27 00:02:03.000000000 -0500
+@@ -45,11 +45,7 @@
+
+ if body && response
+ html_body = body.length > 0 ? body : '<html></html>'
+- if WWW::Mechanize.html_parser == Nokogiri::HTML
+- @parser = Mechanize.html_parser.parse(html_body, nil, @encoding)
+- else
+- @parser = Mechanize.html_parser.parse(html_body)
+- end
++ @parser = Mechanize.html_parser.parse(html_body)
+ end
+
+ @parser
+diff -Nur -x '*.orig' -x '*~' libwww-mechanize-ruby-0.9.1/lib/www/mechanize/util.rb libwww-mechanize-ruby-0.9.1.new/lib/www/mechanize/util.rb
+--- libwww-mechanize-ruby-0.9.1/lib/www/mechanize/util.rb 2009-01-24 14:58:48.000000000 -0500
++++ libwww-mechanize-ruby-0.9.1.new/lib/www/mechanize/util.rb 2009-02-27 00:03:17.000000000 -0500
+@@ -23,22 +23,11 @@
+ end
+
+ def to_native_charset(s, code=nil)
+- if Mechanize.html_parser == Nokogiri::HTML
+- return unless s
+- code ||= detect_charset(s)
+- Iconv.iconv("UTF-8", code, s).join("")
+- else
+- s
+- end
++ return s
+ end
+
+ def from_native_charset(s, code)
+- if Mechanize.html_parser == Nokogiri::HTML
+- return unless s
+- Iconv.iconv(code, "UTF-8", s).join("")
+- else
+- return s
+- end
++ return s
+ end
+
+ def html_unescape(s)
+diff -Nur -x '*.orig' -x '*~' libwww-mechanize-ruby-0.9.1/lib/www/mechanize.rb libwww-mechanize-ruby-0.9.1.new/lib/www/mechanize.rb
+--- libwww-mechanize-ruby-0.9.1/lib/www/mechanize.rb 2009-02-27 00:01:33.000000000 -0500
++++ libwww-mechanize-ruby-0.9.1.new/lib/www/mechanize.rb 2009-02-27 00:01:36.000000000 -0500
+@@ -6,7 +6,7 @@
+ require 'stringio'
+ require 'digest/md5'
+ require 'fileutils'
+-require 'nokogiri'
++require 'hpricot'
+ require 'forwardable'
+ require 'iconv'
+ require 'nkf'
+@@ -88,7 +88,7 @@
+
+ alias :follow_redirect? :redirect_ok
+
+- @html_parser = Nokogiri::HTML
++ @html_parser = Hpricot
+ class << self; attr_accessor :html_parser, :log end
+
+ def initialize
More information about the Pkg-ruby-extras-commits
mailing list