[DRE-commits] [SCM] ruby-mechanize.git branch, master, updated. debian/2.7.1-1

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 72fd9f2bfdd4951e41d843a0b1ce14105fa86c2a
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Mon Jun 24 10:35:51 2013 -0500

    New upstream release
    
    * New upstream release
    * Added build-dep, dependency on ruby-http-cookie

diff --git a/debian/changelog b/debian/changelog
index 3dc15fb..7a54edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-mechanize (2.7.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Added build-dep, dependency on ruby-http-cookie
+
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 24 Jun 2013 10:07:42 -0500
+
 ruby-mechanize (2.6.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 6ec3f86..e16a01b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Christian Hofstaedtler <christian at hofstaedtler.name>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-net-http-digest-auth, ruby-net-http-persistent (>= 2.5), ruby-nokogiri, ruby-webrobots, ruby-ntlm, ruby-domain-name, ruby-minitest, ruby-mime-types, netbase
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-net-http-digest-auth, ruby-net-http-persistent (>= 2.5), ruby-nokogiri, ruby-webrobots, ruby-ntlm, ruby-domain-name, ruby-minitest, ruby-mime-types, netbase, ruby-http-cookie
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mechanize.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-mechanize.git;a=summary
@@ -13,7 +13,7 @@ XS-Ruby-Versions: all
 Package: ruby-mechanize
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-net-http-digest-auth, ruby-net-http-persistent (>= 2.5), ruby-nokogiri, ruby-webrobots, ruby-ntlm, ruby-domain-name, ruby-mime-types
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-net-http-digest-auth, ruby-net-http-persistent (>= 2.5), ruby-nokogiri, ruby-webrobots, ruby-ntlm, ruby-domain-name, ruby-mime-types, ruby-http-cookie
 Description: library used for automating interaction with websites
  This library is used for automating interaction with websites.
  Mechanize automatically stores and sends cookies, follows redirects,
diff --git a/debian/patches/dont_require_rubygems b/debian/patches/dont_require_rubygems
index 4d27941..6e0a33e 100644
--- a/debian/patches/dont_require_rubygems
+++ b/debian/patches/dont_require_rubygems
@@ -7,8 +7,8 @@ Description: Remove the 'rubygems' call
 
 Index: ruby-mechanize/lib/mechanize/test_case.rb
 ===================================================================
---- ruby-mechanize.orig/lib/mechanize/test_case.rb	2012-01-23 11:34:15.000000000 -0600
-+++ ruby-mechanize/lib/mechanize/test_case.rb	2012-01-23 11:35:19.000000000 -0600
+--- ruby-mechanize.orig/lib/mechanize/test_case.rb	2013-06-24 10:09:19.000000000 -0500
++++ ruby-mechanize/lib/mechanize/test_case.rb	2013-06-24 10:09:19.000000000 -0500
 @@ -5,11 +5,14 @@
  require 'webrick'
  require 'zlib'
diff --git a/debian/patches/set_path_for_test b/debian/patches/set_path_for_test
index 166e293..973cee1 100644
--- a/debian/patches/set_path_for_test
+++ b/debian/patches/set_path_for_test
@@ -8,11 +8,11 @@ Description: Fix the provided path for te tests
 
 Index: ruby-mechanize/lib/mechanize/test_case.rb
 ===================================================================
---- ruby-mechanize.orig/lib/mechanize/test_case.rb	2013-05-06 15:57:41.884090539 +0200
-+++ ruby-mechanize/lib/mechanize/test_case.rb	2013-05-06 15:57:41.876090614 +0200
+--- ruby-mechanize.orig/lib/mechanize/test_case.rb	2013-06-24 10:09:24.000000000 -0500
++++ ruby-mechanize/lib/mechanize/test_case.rb	2013-06-24 10:09:24.000000000 -0500
 @@ -34,7 +34,9 @@
  
- class Mechanize::TestCase < MiniTest::Unit::TestCase
+ class Mechanize::TestCase < Minitest::Test
  
 -  TEST_DIR = File.expand_path '../../../test', __FILE__
 +  # Test directory changed to what matches the Debian build process
@@ -23,8 +23,8 @@ Index: ruby-mechanize/lib/mechanize/test_case.rb
    ##
 Index: ruby-mechanize/lib/mechanize/test_case/gzip_servlet.rb
 ===================================================================
---- ruby-mechanize.orig/lib/mechanize/test_case/gzip_servlet.rb	2013-05-06 15:57:41.884090539 +0200
-+++ ruby-mechanize/lib/mechanize/test_case/gzip_servlet.rb	2013-05-06 15:57:41.876090614 +0200
+--- ruby-mechanize.orig/lib/mechanize/test_case/gzip_servlet.rb	2013-06-24 10:09:24.000000000 -0500
++++ ruby-mechanize/lib/mechanize/test_case/gzip_servlet.rb	2013-06-24 10:09:24.000000000 -0500
 @@ -3,7 +3,9 @@
  
  class GzipServlet < WEBrick::HTTPServlet::AbstractServlet

-- 
ruby-mechanize.git