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

[Tobias Grimm]

Author: tiber-guest
Date: 2010-10-26 23:44:57 +0000 (Tue, 26 Oct 2010)
New Revision: 5955

Removed:
   trunk/librspec-ruby/debian/patches/14_ruby1.9.2-lambda.patch
   trunk/librspec-ruby/debian/patches/16_ruby1.9.2-class-variable.patch
Modified:
   trunk/librspec-ruby/debian/changelog
   trunk/librspec-ruby/debian/patches/series
Log:
* New upstream release - This is a minor bugfix release before switching to
  to RSpec 2
* Dropped patches (fixed upstream):
  - 14_ruby1.9.2-lambda.patch
  - 16_ruby1.9.2-class-variable.patch

Modified: trunk/librspec-ruby/debian/changelog
===================================================================
--- trunk/librspec-ruby/debian/changelog	2010-10-26 22:15:44 UTC (rev 5954)
+++ trunk/librspec-ruby/debian/changelog	2010-10-26 23:44:57 UTC (rev 5955)
@@ -1,3 +1,13 @@
+librspec-ruby (1.3.1-1) unstable; urgency=low
+
+  * New upstream release - This is a minor bugfix release before switching to
+    to RSpec 2
+  * Dropped patches (fixed upstream):
+    - 14_ruby1.9.2-lambda.patch
+    - 16_ruby1.9.2-class-variable.patch
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 27 Oct 2010 01:32:12 +0200
+
 librspec-ruby (1.3.0-3) unstable; urgency=low
 
   * Added support for Ruby 1.9.2 which introduced some breaking changes like no

Deleted: trunk/librspec-ruby/debian/patches/14_ruby1.9.2-lambda.patch
===================================================================
--- trunk/librspec-ruby/debian/patches/14_ruby1.9.2-lambda.patch	2010-10-26 22:15:44 UTC (rev 5954)
+++ trunk/librspec-ruby/debian/patches/14_ruby1.9.2-lambda.patch	2010-10-26 23:44:57 UTC (rev 5955)
@@ -1,29 +0,0 @@
-Author: Tobias Grimm <etobi at debian.org>
-Description: Ruby 1.9.2 requires a lambda block which is passed to instance_eval
-to contain an argument. instance_eval will pass self as this argument.
-Index: librspec-ruby-1.3.0/lib/spec/example/example_group_methods.rb
-===================================================================
---- librspec-ruby-1.3.0.orig/lib/spec/example/example_group_methods.rb	2010-08-17 00:19:15.000000000 +0200
-+++ librspec-ruby-1.3.0/lib/spec/example/example_group_methods.rb	2010-08-17 00:19:10.000000000 +0200
-@@ -77,7 +77,7 @@
-       end
- 
-       def pending_implementation
--        lambda { raise(Spec::Example::NotYetImplementedError) }
-+        lambda { |*args| raise(Spec::Example::NotYetImplementedError) }
-       end
- 
-       alias_method :it, :example
-Index: librspec-ruby-1.3.0/lib/spec/example/subject.rb
-===================================================================
---- librspec-ruby-1.3.0.orig/lib/spec/example/subject.rb	2010-08-17 00:20:01.000000000 +0200
-+++ librspec-ruby-1.3.0/lib/spec/example/subject.rb	2010-08-17 00:19:58.000000000 +0200
-@@ -40,7 +40,7 @@
-         end
- 
-         def implicit_subject
--          (described_class ? lambda {described_class.new} : lambda {description_args.first})
-+          (described_class ? lambda {|*args| described_class.new} : lambda {|*args| description_args.first})
-         end
-       end
- 

Deleted: trunk/librspec-ruby/debian/patches/16_ruby1.9.2-class-variable.patch
===================================================================
--- trunk/librspec-ruby/debian/patches/16_ruby1.9.2-class-variable.patch	2010-10-26 22:15:44 UTC (rev 5954)
+++ trunk/librspec-ruby/debian/patches/16_ruby1.9.2-class-variable.patch	2010-10-26 23:44:57 UTC (rev 5955)
@@ -1,20 +0,0 @@
-Author: Tobias Grimm <etobi at debian.org>
-Description: Ruby 1.9.2 allows class variable access again.
-Index: librspec-ruby-1.3.0/spec/spec/example/example_group_spec.rb
-===================================================================
---- librspec-ruby-1.3.0.orig/spec/spec/example/example_group_spec.rb	2010-08-17 00:25:00.000000000 +0200
-+++ librspec-ruby-1.3.0/spec/spec/example/example_group_spec.rb	2010-08-17 00:24:51.000000000 +0200
-@@ -24,11 +24,9 @@
-         end
-       end
-       
--      it "can NOT access class variables in examples in Ruby 1.9" do
-+      it "can access class variables in examples in Ruby 1.9" do
-         with_ruby 1.9 do
--          lambda do
--            @@class_variable.should == "a class variable"
--          end.should raise_error(NameError)
-+          @@class_variable.should == "a class variable"
-         end
-       end
-       

Modified: trunk/librspec-ruby/debian/patches/series
===================================================================
--- trunk/librspec-ruby/debian/patches/series	2010-10-26 22:15:44 UTC (rev 5954)
+++ trunk/librspec-ruby/debian/patches/series	2010-10-26 23:44:57 UTC (rev 5955)
@@ -1,8 +1,6 @@
 10-force-spec-binary-path.patch
 11_dont-require-rubygems.patch
 13_skip-unsupported-tests.patch
-14_ruby1.9.2-lambda.patch
 15_ruby1.9.2-array-sort.patch
-16_ruby1.9.2-class-variable.patch
 17_ruby1.9.2-formatter-samples.patch
 18_ruby1.9.2-minor-test-fix.patch