[DRE-commits] r3829 - in packages/librspec-ruby/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2009-07-25 13:43:41 +0000 (Sat, 25 Jul 2009)
New Revision: 3829

Added:
   packages/librspec-ruby/trunk/debian/patches/12_differ-test-fix.dpatch
Modified:
   packages/librspec-ruby/trunk/debian/changelog
   packages/librspec-ruby/trunk/debian/control
   packages/librspec-ruby/trunk/debian/patches/00list
Log:
* New upstream release
* Added 12_differ-test-fix.dpatch (reported upstream as ticket #862)
* Increased standards version to 3.8.2

Modified: packages/librspec-ruby/trunk/debian/changelog
===================================================================
--- packages/librspec-ruby/trunk/debian/changelog	2009-07-25 00:38:08 UTC (rev 3828)
+++ packages/librspec-ruby/trunk/debian/changelog	2009-07-25 13:43:41 UTC (rev 3829)
@@ -1,3 +1,11 @@
+librspec-ruby (1.2.8-1) unstable; urgency=low
+
+  * New upstream release
+  * Added 12_differ-test-fix.dpatch (reported upstream as ticket #862)
+  * Increased standards version to 3.8.2
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 25 Jul 2009 15:40:48 +0200
+
 librspec-ruby (1.2.6-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/librspec-ruby/trunk/debian/control
===================================================================
--- packages/librspec-ruby/trunk/debian/control	2009-07-25 00:38:08 UTC (rev 3828)
+++ packages/librspec-ruby/trunk/debian/control	2009-07-25 13:43:41 UTC (rev 3829)
@@ -4,7 +4,7 @@
 Maintainer: Sebastien Delafond <seb at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Tobias Grimm <etobi at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, help2man, ruby, libdifflcs-ruby1.8, libheckle-ruby1.8
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://rspec.info
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/librspec-ruby/
 Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/librspec-ruby/

Modified: packages/librspec-ruby/trunk/debian/patches/00list
===================================================================
--- packages/librspec-ruby/trunk/debian/patches/00list	2009-07-25 00:38:08 UTC (rev 3828)
+++ packages/librspec-ruby/trunk/debian/patches/00list	2009-07-25 13:43:41 UTC (rev 3829)
@@ -1,2 +1,3 @@
 10-force-spec-binary-path
 11_dont-require-rubygems
+12_differ-test-fix

Added: packages/librspec-ruby/trunk/debian/patches/12_differ-test-fix.dpatch
===================================================================
--- packages/librspec-ruby/trunk/debian/patches/12_differ-test-fix.dpatch	                        (rev 0)
+++ packages/librspec-ruby/trunk/debian/patches/12_differ-test-fix.dpatch	2009-07-25 13:43:41 UTC (rev 3829)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_differ-test-fix.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a test for the default differ
+## DP: Reported upstream:
+## DP: https://rspec.lighthouseapp.com/projects/5645/tickets/862-default-differ-test-fails-because-of-different-hash-ordering
+
+ at DPATCH@
+diff -urNad librspec-ruby-1.2.8~/spec/spec/expectations/differs/default_spec.rb librspec-ruby-1.2.8/spec/spec/expectations/differs/default_spec.rb
+--- librspec-ruby-1.2.8~/spec/spec/expectations/differs/default_spec.rb	2009-07-16 01:04:43.000000000 +0200
++++ librspec-ruby-1.2.8/spec/spec/expectations/differs/default_spec.rb	2009-07-25 15:10:03.000000000 +0200
+@@ -111,15 +112,15 @@
+     expected = { "foo" => "bar", "fizz" => [1, 2, 3] }
+     actual   = { "foo" => "baz", "fizz" => [1, 2] }
+ 
+-    expected_diff = <<'EOD'
++    expected_diff = <<"EOD"
+ 
+ Expected the key "fizz" to be [1, 2, 3], but was [1, 2]
+ Expected the key "foo" to be "bar", but was "baz"
+ 
+ 
+ @@ -1,2 +1,2 @@
+--{"foo"=>"bar", "fizz"=>[1, 2, 3]}
+-+{"foo"=>"baz", "fizz"=>[1, 2]}
++-#{PP.singleline_pp(expected, '')}
+++#{PP.singleline_pp(actual, '')}
+ EOD
+ 
+