[DRE-commits] [ruby-sawyer] 02/02: Upload to unstable

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository ruby-sawyer.

commit 915959c330a82136304f48f2cfb135b63c332142
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri May 22 22:06:48 2015 -0300

    Upload to unstable
---
 debian/changelog                                   | 11 +++++++++
 debian/compat                                      |  2 +-
 debian/control                                     |  4 ++--
 debian/copyright                                   |  2 +-
 debian/patches/01_fix_tests_encoding_issue.diff    | 27 ++++++++++++++++++++++
 ..._disable_tests_depending_on_network_access.diff | 21 +++++++++++++++++
 debian/patches/series                              |  2 ++
 7 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f80cd30..f734fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-sawyer (0.6.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.6. No changes were required.
+  * Bump DH compat level to 9.
+  * Update copyright dates.
+  * Add patch to workaround encoding errors in a couple of unit tests.
+  * Add patch to disable unit tests that need network access.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Fri, 22 May 2015 20:06:11 -0300
+
 ruby-sawyer (0.5.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 8dcc013..50e1450 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Miguel Landaeta <nomadium at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~),
+Build-Depends: debhelper (>= 9~), gem2deb (>= 0.6.1~),
  ruby-faraday (>= 0.8~), ruby-addressable (>= 2.3.5~)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-sawyer.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-sawyer.git;a=summary
 Homepage: https://github.com/lostisland/sawyer
diff --git a/debian/copyright b/debian/copyright
index 625491d..af8ea90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Copyright: 2011-2014, Rick Olson <technoweenie at gmail.com>
 License: Expat
 
 Files: debian/*
-Copyright: 2014, Miguel Landaeta <nomadium at debian.org>
+Copyright: 2014-2015, Miguel Landaeta <nomadium at debian.org>
 License: Expat
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
diff --git a/debian/patches/01_fix_tests_encoding_issue.diff b/debian/patches/01_fix_tests_encoding_issue.diff
new file mode 100644
index 0000000..a69c28e
--- /dev/null
+++ b/debian/patches/01_fix_tests_encoding_issue.diff
@@ -0,0 +1,27 @@
+Description: <short summary of the patch>
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2015-05-22
+
+--- ruby-sawyer-0.6.0.orig/test/relation_test.rb
++++ ruby-sawyer-0.6.0/test/relation_test.rb
+@@ -168,7 +168,7 @@ module Sawyer
+       rel  = Sawyer::Relation.from_link(nil, :self, hash)
+       map << rel
+ 
+-      assert_equal "{:self_url=>\"/users/1\"}\n", map.inspect
++      assert_equal "{:self_url=>\"/users/1\"}\n", map.inspect.encode(Encoding::UTF_8)
+     end
+   end
+ end
+--- ruby-sawyer-0.6.0.orig/test/resource_test.rb
++++ ruby-sawyer-0.6.0/test/resource_test.rb
+@@ -180,7 +180,7 @@ module Sawyer
+ 
+     def test_inspect
+       resource = Resource.new @agent, :a => 1
+-      assert_equal "{:a=>1}\n", resource.inspect
++      assert_equal "{:a=>1}\n", resource.inspect.encode(Encoding::UTF_8)
+     end
+ 
+     def test_each
diff --git a/debian/patches/02_disable_tests_depending_on_network_access.diff b/debian/patches/02_disable_tests_depending_on_network_access.diff
new file mode 100644
index 0000000..0e94f93
--- /dev/null
+++ b/debian/patches/02_disable_tests_depending_on_network_access.diff
@@ -0,0 +1,21 @@
+Description: Disable tests that depends on network access
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2015-05-22
+
+--- a/test/agent_test.rb
++++ b/test/agent_test.rb
+@@ -193,9 +193,10 @@ module Sawyer
+         conn.adapter :test, @stubs
+       end
+ 
+-      assert_nothing_raised do
+-        assert_equal 200, agent.root.status
+-      end
++      # Test disabled because during build time there is not network access
++      #assert_nothing_raised do
++      #  assert_equal 200, agent.root.status
++      #end
+     end
+   end
+ end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a92d3d9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_fix_tests_encoding_issue.diff
+02_disable_tests_depending_on_network_access.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sawyer.git